git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d046b8 492340a)
Merge branch 'features/JAL-1641_JSON-extension' into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 4 Jun 2015 09:52:06 +0000 (10:52 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 4 Jun 2015 09:52:06 +0000 (10:52 +0100)

Trivial merge