Merge branch 'develop' into features/JAL-2295setChimeraAttributes
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 16 Nov 2016 12:23:33 +0000 (12:23 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 16 Nov 2016 12:23:33 +0000 (12:23 +0000)
commit58951652adedb7c15569b5295359baa4c3a81e1e
treed81c695bae96d55a4df857d2493164afab53e770
parentacdc158f5c20ab04bb40e3b0580f3da02e4f744e
parente60cacff9260c47c12cf34a7e191678cfc97d265
Merge branch 'develop' into features/JAL-2295setChimeraAttributes

Conflicts:
src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
src/jalview/gui/ChimeraViewFrame.java
src/jalview/datamodel/SequenceFeature.java
src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
src/jalview/gui/ChimeraViewFrame.java
src/jalview/gui/JalviewChimeraBindingModel.java
test/jalview/datamodel/SequenceFeatureTest.java