Merge branch 'features/JAL-2360colourSchemeApplicability' into features/JAL-2371colle...
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 6 Jan 2017 14:11:24 +0000 (14:11 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 6 Jan 2017 14:11:24 +0000 (14:11 +0000)
commit09d9063e70931a6cb75d16b230f5cd0665f0f340
tree2cb9f8ac96b18f78a819cfb142ae797335082d25
parent24680a271861e9309a2241c8884874656ac111b1
parentdfd021096780038aa9389ed96f6ce938244f95c4
Merge branch 'features/JAL-2360colourSchemeApplicability' into features/JAL-2371collectionColourScheme
src/jalview/io/AnnotationFile.java
src/jalview/schemes/ColourSchemeI.java
src/jalview/schemes/ResidueColourScheme.java