From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 19 May 2020 16:27:32 +0000 (+0100)
Subject: Merge branch 'develop' into feature/JAL-3551Pymol
X-Git-Tag: Release_2_11_2_0~37^2~13
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=4f30214e8098748469c6a4269ac2ed6c5750e4b0;hp=4f30214e8098748469c6a4269ac2ed6c5750e4b0;p=jalview.git

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
---