git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5965127 5f201ab)
Merge branch 'develop' into features/JAL-2295setChimeraAttributes
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 30 Nov 2016 10:48:35 +0000 (10:48 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 30 Nov 2016 10:48:35 +0000 (10:48 +0000)

Trivial merge