From: Jim Procter <j.procter@dundee.ac.uk>
Date: Tue, 21 Oct 2014 10:10:52 +0000 (+0100)
Subject: Merge branch 'features/JAL-1264_showHideAnnotations' into forpush/JAL-674_dssp
X-Git-Tag: Jalview_2_9~169^2~22
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=57c4f810f995895293ef4a9d956dd9c9a767d41f;p=jalview.git

Merge branch 'features/JAL-1264_showHideAnnotations' into forpush/JAL-674_dssp
EOL changes conflict with new lines from mungo's branch
Conflicts:
	resources/lang/Messages.properties
	src/jalview/datamodel/SequenceI.java
---

57c4f810f995895293ef4a9d956dd9c9a767d41f
diff --cc src/jalview/datamodel/SequenceI.java
index 5c77940,876db03..2e68371
--- a/src/jalview/datamodel/SequenceI.java
+++ b/src/jalview/datamodel/SequenceI.java
@@@ -20,7 -20,8 +20,7 @@@
   */
  package jalview.datamodel;
  
- import java.util.Vector;
+ import java.util.List;
 -import java.util.Vector;
  
  import fr.orsay.lri.varna.models.rna.RNA;