JAL-2136 merged and resolved conflicts with 80edaa84d6d9beac9f0d2c71b50b7b56fd393427
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 20 Feb 2017 12:25:32 +0000 (12:25 +0000)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 20 Feb 2017 12:25:32 +0000 (12:25 +0000)
commitd980f203d66517042c7d2707ec300c653cae1892
tree701a9129ec15d557be4558cd873b308cea1afd89
parent62b9717ef823d2e510632e39790642848179deaf
parent80edaa84d6d9beac9f0d2c71b50b7b56fd393427
JAL-2136 merged and resolved conflicts with 80edaa84d6d9beac9f0d2c71b50b7b56fd393427
15 files changed:
src/MCview/AppletPDBCanvas.java
src/MCview/PDBCanvas.java
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/AppletJmol.java
src/jalview/appletgui/AppletJmolBinding.java
src/jalview/appletgui/ExtJmol.java
src/jalview/ext/jmol/JalviewJmolBinding.java
src/jalview/gui/AppJmol.java
src/jalview/gui/AppJmolBinding.java
src/jalview/gui/ChimeraViewFrame.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/StructureChooser.java
src/jalview/gui/StructureViewerBase.java
src/jalview/structure/StructureSelectionManager.java
test/jalview/structures/models/AAStructureBindingModelTest.java