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

Trivial merge