Merge branch 'develop' into feature/JAL-3551Pymol
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 19 May 2020 16:27:32 +0000 (17:27 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 19 May 2020 16:27:32 +0000 (17:27 +0100)
commit4f30214e8098748469c6a4269ac2ed6c5750e4b0
tree111645c5da9beba262e127e55e898569f78cab2e
parent9dabc02511e3a334a5749a504f57f69d6c9017bd
parent0bc9297afd18a3e2b412364bf1af426570555b9a
Merge branch 'develop' into feature/JAL-3551Pymol

Conflicts:
src/jalview/ext/jmol/JalviewJmolBinding.java
src/jalview/ext/jmol/JmolCommands.java
src/jalview/gui/AppJmol.java
src/jalview/gui/AppJmolBinding.java
src/jalview/gui/ChimeraViewFrame.java
src/jalview/gui/StructureViewerBase.java
src/jalview/jbgui/GPreferences.java
src/jalview/jbgui/GStructureViewer.java
src/jalview/project/Jalview2XML.java
20 files changed:
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/AppletJmol.java
src/jalview/appletgui/AppletJmolBinding.java
src/jalview/appletgui/ExtJmol.java
src/jalview/appletgui/UserDefinedColours.java
src/jalview/datamodel/features/SequenceFeatures.java
src/jalview/ext/jmol/JalviewJmolBinding.java
src/jalview/ext/jmol/JmolCommands.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AppJmol.java
src/jalview/gui/AppJmolBinding.java
src/jalview/gui/ChimeraViewFrame.java
src/jalview/gui/Preferences.java
src/jalview/gui/StructureViewerBase.java
src/jalview/jbgui/GPreferences.java
src/jalview/jbgui/GStructureViewer.java
src/jalview/project/Jalview2XML.java
test/jalview/structure/StructureSelectionManagerTest.java