git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2de26e5 f3b9ee1)
Merge branch 'develop' into features/JAL-1780_export-settings_flatfile
authorJim Procter <jprocter@issues.jalview.org>
Wed, 17 Jun 2015 14:58:48 +0000 (15:58 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 17 Jun 2015 14:58:48 +0000 (15:58 +0100)

Trivial merge