Merge JAL-2136_phyre2_integration to develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 20 Mar 2017 15:14:27 +0000 (15:14 +0000)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 20 Mar 2017 15:14:27 +0000 (15:14 +0000)
commitbcd6cac49e4d2b1f91917753da0d119eb79055d1
tree87413dc06d9f7cf35ffbbf64a6f8fce03896cae0
parentc03aaae74c93db1c8fa0e95258bfbccfe1d3106d
parent33cd496c5d0b474f3e9fce004c0558eaaa5c738c
Merge JAL-2136_phyre2_integration to develop
14 files changed:
resources/lang/Messages.properties
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/AppletJmol.java
src/jalview/ext/jmol/JalviewJmolBinding.java
src/jalview/ext/rbvi/chimera/AtomSpecModel.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AppJmol.java
src/jalview/gui/ChimeraViewFrame.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/StructureViewerBase.java
src/jalview/io/AnnotationFile.java
src/jalview/structure/StructureSelectionManager.java
src/jalview/ws/sifts/SiftsClient.java
test/jalview/structures/models/AAStructureBindingModelTest.java