From: Jim Procter <jprocter@dundee.ac.uk>
Date: Fri, 25 Apr 2014 16:15:36 +0000 (+0100)
Subject: Merge branch 'JAL-1177_prop_rnasecstr' into develop
X-Git-Tag: Jalview_2_9~195
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c07ef0cc5eabc7df4eb15bb3541a702278783f05;p=jalview.git

Merge branch 'JAL-1177_prop_rnasecstr' into develop

Conflicts:
	src/jalview/schemes/ColourSchemeProperty.java

-- whitespace conflicts only
---

c07ef0cc5eabc7df4eb15bb3541a702278783f05
diff --cc src/jalview/schemes/ColourSchemeProperty.java
index d608a80,c655fe2..91a4890
--- a/src/jalview/schemes/ColourSchemeProperty.java
+++ b/src/jalview/schemes/ColourSchemeProperty.java
@@@ -502,12 -487,10 +502,9 @@@ public class ColourSchemePropert
        cs = new TCoffeeColourScheme(coll);
        break;
        
- 
-       
-     // case COVARIATION:
-     // cs = new CovariationColourScheme(annotation);
- 
+       // case COVARIATION:
+       // cs = new CovariationColourScheme(annotation);
 -
 -      // break;
 +    // break;
  
      case USER_DEFINED:
        Color[] col = new Color[24];