merge develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 1 May 2017 14:02:17 +0000 (15:02 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 1 May 2017 14:02:17 +0000 (15:02 +0100)
commit207b06de28859536277608ad94897eaa526b1279
tree0c4cacd4b40bf030846e06304d42098d784a8230
parent8537d486848be3e97578248dae6bede12e343fe1
parentf80180a53bf16dc72ecdd4ace0f70c83cb0d274a
merge develop
18 files changed:
resources/lang/Messages.properties
src/MCview/AppletPDBCanvas.java
src/MCview/PDBCanvas.java
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/AppletJmolBinding.java
src/jalview/appletgui/ExtJmol.java
src/jalview/ext/jmol/JalviewJmolBinding.java
src/jalview/ext/jmol/JmolCommands.java
src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AppJmolBinding.java
src/jalview/gui/ChimeraViewFrame.java
src/jalview/gui/Jalview2XML.java
src/jalview/javascript/MouseOverStructureListener.java
src/jalview/structures/models/AAStructureBindingModel.java
src/jalview/ws/sifts/SiftsClient.java
test/jalview/structures/models/AAStructureBindingModelTest.java
test/jalview/ws/sifts/SiftsClientTest.java