Merge remote-tracking branch 'origin/releases/Release_2_10_3_Branch'
authorkjvdheide <kjvanderheide@dundee.ac.uk>
Mon, 20 Nov 2017 15:32:02 +0000 (15:32 +0000)
committerkjvdheide <kjvanderheide@dundee.ac.uk>
Mon, 20 Nov 2017 15:32:37 +0000 (15:32 +0000)
commit7dbf1fca15e0828b0bcad5769892e77e03916795
treec37aabe14e9d79716e3754dc813a6b1000052cba
parentc737743893559b3eba3eade8f97dabfce38eee6e
parent398793bf95b10058f55dcba2219cc188187c4d77
Merge remote-tracking branch 'origin/releases/Release_2_10_3_Branch'
into kjvdh/features/PhylogenyViewer

Conflicts:
.classpath
.classpath
resources/lang/Messages.properties
src/jalview/fts/core/GFTSPanel.java
src/jalview/fts/service/pdb/PDBFTSPanel.java
src/jalview/gui/Desktop.java
src/jalview/gui/OverviewPanel.java