git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc7f77e 6eadc41)
Merge branch 'develop' of https://source.jalview.org/git/jalview.git
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 4 May 2016 15:22:53 +0000 (16:22 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 4 May 2016 15:22:53 +0000 (16:22 +0100)
into develop

Conflicts:
lib/xercesImpl.jar


Trivial merge