git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2a42323 7431a6e)
Merge branch 'features/JAL-1641_JSON_' into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 12 May 2015 10:16:20 +0000 (11:16 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 12 May 2015 10:16:20 +0000 (11:16 +0100)

Trivial merge