Merge branch 'features/JAL-2295setChimeraAttributes' into
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 1 Mar 2017 14:38:50 +0000 (14:38 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 1 Mar 2017 14:38:50 +0000 (14:38 +0000)
commit4762b29420ed4df01b55a8afe5ab05467aaf41a9
treec0f4031736871ec99120d4054bba4cc90720276f
parent29c183b0d0de9f6f9f94d2b528d10e20b1891684
parentc5cece0a9d56e59293c8e6497b5afa6e26842646
Merge branch 'features/JAL-2295setChimeraAttributes' into
merges/develop_JAL2295setChimeraAttributes

Conflicts:
src/jalview/ext/rbvi/chimera/ChimeraCommands.java
src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
src/jalview/gui/ChimeraViewFrame.java
test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java
13 files changed:
resources/lang/Messages.properties
src/MCview/PDBChain.java
src/jalview/analysis/AlignmentUtils.java
src/jalview/api/AlignViewportI.java
src/jalview/ext/rbvi/chimera/ChimeraCommands.java
src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
src/jalview/gui/AnnotationRowFilter.java
src/jalview/gui/ChimeraViewFrame.java
src/jalview/gui/JalviewChimeraBindingModel.java
src/jalview/viewmodel/AlignmentViewport.java
src/jalview/workers/ConsensusThread.java
test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java
test/jalview/gui/AnnotationChooserTest.java