Merge branch 'JAL-1177_prop_rnasecstr' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Fri, 25 Apr 2014 16:15:36 +0000 (17:15 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Fri, 25 Apr 2014 16:15:36 +0000 (17:15 +0100)
commitc07ef0cc5eabc7df4eb15bb3541a702278783f05
tree659d3f54ae1ea0b7c4bebd7a15a7e591dc32b012
parent3dc91266f28137e904d18e784c5eeef15a1229ce
parent133ad29f7714577fdf75762a9d023f4c1af60fd0
Merge branch 'JAL-1177_prop_rnasecstr' into develop

Conflicts:
src/jalview/schemes/ColourSchemeProperty.java

-- whitespace conflicts only
src/jalview/datamodel/Sequence.java
src/jalview/schemes/ColourSchemeProperty.java