Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/featu...
authorkjvdheide <kjvanderheide@dundee.ac.uk>
Tue, 24 Oct 2017 08:17:45 +0000 (09:17 +0100)
committerkjvdheide <kjvanderheide@dundee.ac.uk>
Tue, 24 Oct 2017 08:17:45 +0000 (09:17 +0100)
commit1d99bdfeadca1e367fa1102e826592e90c35ed9e
tree61c80305350c578746e2ea163d2f8baa382eab64
parente850d8cdbb327813038d0f1961d4b34988e3be0d
parent5b7c6735d44fbd8d2c3fd36ede2ae7520fc16b7e
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/features/PhylogenyViewer
src/jalview/gui/AlignFrame.java
src/jalview/gui/TreePanel.java