Merge branch 'features/JAL-2040_JAL-2137_phyre2' into reviews/features/JAL-2136_phyre...
authorJim Procter <jprocter@issues.jalview.org>
Mon, 23 Jan 2017 15:13:33 +0000 (15:13 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 23 Jan 2017 15:13:33 +0000 (15:13 +0000)
commit3877548f65e22f91bae557c3d9edb17d75fbf2c9
tree4618734294dbdba332f1f3a12efa708fe593f9f4
parent42ca4613b0a07bab7c27a61b11acafdc9a3c27d1
parent3e98c1348b037f0972367245a524f182029a9686
Merge branch 'features/JAL-2040_JAL-2137_phyre2' into reviews/features/JAL-2136_phyre2_integration_withJims
src/jalview/ext/jmol/JmolParser.java
src/jalview/io/AnnotationFile.java
src/jalview/structure/StructureSelectionManager.java