git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa753f4 d206765)
Merge branch 'features/JAL-1641_JSON-extension' into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 2 Jun 2015 15:51:56 +0000 (16:51 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 2 Jun 2015 15:51:56 +0000 (16:51 +0100)

Trivial merge