Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/featu...
authorkjvdheide <kjvanderheide@dundee.ac.uk>
Wed, 25 Oct 2017 18:26:34 +0000 (19:26 +0100)
committerkjvdheide <kjvanderheide@dundee.ac.uk>
Wed, 25 Oct 2017 18:26:34 +0000 (19:26 +0100)
commit062ebc02980364930ceb26dd6c06448af971fe20
treeb062185d780f7e26d6356b409ca03d015f64efdb
parent6a9def7119ce1f0057a0fd686b4d3f2acb4c32fa
parent2e78324ac6e6dba9f3db8939df4e777a0b097300
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/features/PhylogenyViewer
src/jalview/gui/AlignFrame.java
src/jalview/gui/CalculationChooser.java