git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 064b38c 77b160b)
Merge branch 'develop' into features/mchmmer
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 18 Apr 2018 13:22:41 +0000 (14:22 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 18 Apr 2018 13:22:41 +0000 (14:22 +0100)
Conflicts:
.classpath


Trivial merge