Merge branch 'feature/JAL-3127_seqidChainshading' into merge/JAL-3127
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 11 Mar 2019 11:37:58 +0000 (11:37 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 11 Mar 2019 11:37:58 +0000 (11:37 +0000)
commit16d109024847af92482237e43f99b82fd997451a
tree221cc11f8d222a7baa91c903ea7c6b73e8e39395
parent7091ed4ecff294623230f96ed93f9a5689ea5938
parent7bcf1bc9aa417c4b256687d86d4e37a9f8a3aa11
Merge branch 'feature/JAL-3127_seqidChainshading' into merge/JAL-3127

Conflicts:
src/jalview/gui/Jalview2XML.java
src/jalview/gui/Jalview2XML_V1.java
test/jalview/io/Jalview2xmlTests.java
14 files changed:
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/bin/Jalview.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/AnnotationColourChooser.java
src/jalview/gui/PopupMenu.java
src/jalview/gui/TreeCanvas.java
src/jalview/project/Jalview2XML.java
src/jalview/schemes/AnnotationColourGradient.java
src/jalview/viewmodel/AlignmentViewport.java
test/jalview/project/Jalview2xmlTests.java
test/jalview/schemes/AnnotationColourGradientTest.java