git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2399fe 8294bb0)
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 11 Jan 2016 14:58:24 +0000 (14:58 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 11 Jan 2016 14:58:24 +0000 (14:58 +0000)

Trivial merge