From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 21 Mar 2017 11:07:15 +0000 (+0000)
Subject: Merge branch 'develop' into features/JAL-2446NCList
X-Git-Tag: Release_2_10_3b1~339
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Ffeatures%2FJAL-653_JAL-1766_htslib_refseqsupport;p=jalview.git

Merge branch 'develop' into features/JAL-2446NCList

Conflicts:
	src/jalview/datamodel/Sequence.java
	src/jalview/gui/OverviewPanel.java
---

a8a60500f1be9c3e02976f2193eb62ff5a302220
diff --cc src/jalview/datamodel/Sequence.java
index fd60c03,b0faf21..5a3ffa4
--- a/src/jalview/datamodel/Sequence.java
+++ b/src/jalview/datamodel/Sequence.java
@@@ -343,8 -338,7 +342,9 @@@ public class Sequence extends ASequenc
      temp[sequenceFeatures.length] = sf;
  
      sequenceFeatures = temp;
 +
 +    sequenceFeatureStore.add(sf);
+     return true;
    }
  
    @Override