Merge branch 'develop' into bug/JAL-1803_JAL-2157
authorJim Procter <jprocter@issues.jalview.org>
Wed, 7 Sep 2016 11:46:28 +0000 (12:46 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 7 Sep 2016 11:46:28 +0000 (12:46 +0100)
commit3f12f4932226512316ec113e600695150431fd0a
tree7a1c0ee6c3a282c91a01936139293bef0a878474
parent318e3baf6738dea7b20640bc3e46814bd566811c
parenta9b2a4dd7dcbb2c86bb247970a8fe1b2ab6dc37d
Merge branch 'develop' into bug/JAL-1803_JAL-2157
src/jalview/ext/jmol/JmolParser.java
src/jalview/gui/AlignFrame.java
src/jalview/viewmodel/AlignmentViewport.java