Merge branch 'JAL-952_rnahelix' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Sun, 27 Apr 2014 20:41:06 +0000 (21:41 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Sun, 27 Apr 2014 20:41:06 +0000 (21:41 +0100)
commitf806dc4df78ef916ec8c41abeda1e836821ac18d
treeff684b309edef072310272a7434fc08638db9d77
parentebcad849ca7603787599181f3edf38ce470a20af
parenta22e69eeaf0b0447dc31baaf3ba24ec45a42af18
Merge branch 'JAL-952_rnahelix' into develop

Conflicts:
src/jalview/schemes/ColourSchemeProperty.java
src/jalview/schemes/ColourSchemeProperty.java