From: Jim Procter <jprocter@issues.jalview.org>
Date: Tue, 23 Jun 2015 09:13:52 +0000 (+0100)
Subject: Merge branch 'merge/develop_JAL-1780_JAL-653_JAL-1892' into features/JAL-653_JAL... 
X-Git-Tag: Release_2_10_0~296^2~139
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=4ed384b1f2f74dd70636f7a97f73cbc96600ae5c;p=jalview.git

Merge branch 'merge/develop_JAL-1780_JAL-653_JAL-1892' into features/JAL-653_JAL-1766_htslib_refseqsupport
---

4ed384b1f2f74dd70636f7a97f73cbc96600ae5c
diff --cc src/jalview/io/FeaturesFile.java
index 601cdb1,57f6384..60c6bbd
--- a/src/jalview/io/FeaturesFile.java
+++ b/src/jalview/io/FeaturesFile.java
@@@ -171,14 -170,16 +170,14 @@@ public class FeaturesFile extends Align
    }
  
    @Override
-   public void addAnnotations(Alignment al)
+   public void addAnnotations(AlignmentI al)
    {
 -    // TODO Auto-generated method stub
      super.addAnnotations(al);
    }
  
    @Override
-   public void addProperties(Alignment al)
+   public void addProperties(AlignmentI al)
    {
 -    // TODO Auto-generated method stub
      super.addProperties(al);
    }