Merge branch 'spike/JAL-2040_JAL-2137_phyre2' into features/JAL-2040_JAL-2137_phyre2 features/JAL-2040_JAL-2137_phyre2
authorJim Procter <jprocter@issues.jalview.org>
Thu, 19 Jan 2017 17:08:41 +0000 (17:08 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 19 Jan 2017 17:08:41 +0000 (17:08 +0000)
commit3e98c1348b037f0972367245a524f182029a9686
tree7ce93ed2b87e277c56c0a2186b2966d57c40c029
parentc242d1bd498f606f87c5f3c7854b469dd7120730
parent0920ff53a47805479a84980bc09886c939c77399
Merge branch 'spike/JAL-2040_JAL-2137_phyre2' into features/JAL-2040_JAL-2137_phyre2
src/jalview/ext/jmol/JmolParser.java
src/jalview/io/AnnotationFile.java
src/jalview/structure/StructureSelectionManager.java