git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51728d3 84724ad)
Merge branch 'develop' into features/JAL-2446NCList features/JAL-653_JAL-1766_htslib_refseqsupport
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 21 Mar 2017 11:07:15 +0000 (11:07 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 21 Mar 2017 11:07:15 +0000 (11:07 +0000)
Conflicts:
src/jalview/datamodel/Sequence.java
src/jalview/gui/OverviewPanel.java

1  2 
src/jalview/datamodel/Sequence.java patch | diff1 | diff2 | blob | history
src/jalview/datamodel/SequenceI.java patch | diff1 | diff2 | blob | history
src/jalview/gui/SeqCanvas.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/datamodel/Sequence.java
index fd60c03,b0faf21..5a3ffa4
--- 1/src/jalview/datamodel/Sequence.java
--- 2/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
diff --cc src/jalview/datamodel/SequenceI.java
Simple merge
diff --cc src/jalview/gui/SeqCanvas.java
Simple merge