Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/featu...
authorkjvdheide <kjvanderheide@dundee.ac.uk>
Thu, 25 Jan 2018 18:57:58 +0000 (18:57 +0000)
committerkjvdheide <kjvanderheide@dundee.ac.uk>
Thu, 25 Jan 2018 18:57:58 +0000 (18:57 +0000)
commite598a31597ee476dc4428e5a9417200bc77e4357
treec2ddea6b10a539e96532765bfa941d0b7a16f6b0
parentd0d60b415036c2c67eca686e443331bf071e2626
parent82cba0a99ac7c16b89e8399adb158e6a063fecd3
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/features/PhylogenyViewer
resources/lang/Messages.properties
src/jalview/fts/core/GFTSPanel.java