From: Jim Procter <jprocter@issues.jalview.org>
Date: Fri, 10 Feb 2017 18:46:15 +0000 (+0000)
Subject: Merge branch 'develop' into spike/matrix_annot
X-Git-Tag: Release_2_11_3_0~23^2~60^2~9^2~6
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=c007d50b16da69f9a0bab23f8a1afd7347fc7e87

Merge branch 'develop' into spike/matrix_annot
---

c007d50b16da69f9a0bab23f8a1afd7347fc7e87
diff --cc src/jalview/renderer/AnnotationRenderer.java
index 1928ba3,6f84a2e..f5562d7
--- a/src/jalview/renderer/AnnotationRenderer.java
+++ b/src/jalview/renderer/AnnotationRenderer.java
@@@ -29,10 -29,10 +29,12 @@@ import jalview.datamodel.AlignmentAnnot
  import jalview.datamodel.Annotation;
  import jalview.datamodel.ColumnSelection;
  import jalview.datamodel.ProfilesI;
 +import jalview.renderer.api.AnnotationRendererFactoryI;
 +import jalview.renderer.api.AnnotationRowRendererI;
  import jalview.schemes.ColourSchemeI;
+ import jalview.schemes.NucleotideColourScheme;
  import jalview.schemes.ResidueProperties;
+ import jalview.schemes.ZappoColourScheme;
  import jalview.util.Platform;
  
  import java.awt.BasicStroke;