Merge branch 'develop' into features/JAL-2295setChimeraAttributes
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 29 Nov 2016 14:20:41 +0000 (14:20 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 29 Nov 2016 14:20:41 +0000 (14:20 +0000)
commit5965127c38ff1a35d10d806c4b4537cdc1e39579
tree323af8fbc7ef2199981f22642658992ad2ffb1c8
parent7d8f40032746ee633dd980d5609c4d517a40421a
parentb3ff575126349c79f25dcba8526ed8828d668db1
Merge branch 'develop' into features/JAL-2295setChimeraAttributes

Conflicts:
test/jalview/ext/rbvi/chimera/JalviewChimeraView.java
resources/lang/Messages.properties
src/ext/edu/ucsf/rbvi/strucviz2/ChimeraManager.java
src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
src/jalview/gui/ChimeraViewFrame.java
src/jalview/gui/JalviewChimeraBindingModel.java
src/jalview/structure/StructureSelectionManager.java
test/jalview/ext/jmol/JmolViewerTest.java
test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java
test/jalview/ext/rbvi/chimera/JalviewChimeraView.java