From: Jim Procter <jprocter@issues.jalview.org>
Date: Tue, 22 Nov 2016 12:45:31 +0000 (+0000)
Subject: Merge branch 'features/JAL-1738_JAL-345_selectionfromhighlight' into develop
X-Git-Tag: Release_2_10_1~10^2~6^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=134576f5b34894218bdc4c5ce5e27fa18ad973bd;p=jalview.git

Merge branch 'features/JAL-1738_JAL-345_selectionfromhighlight' into develop
---

134576f5b34894218bdc4c5ce5e27fa18ad973bd
diff --cc src/jalview/api/AlignViewportI.java
index 8b80531,2bed605..72542b3
--- a/src/jalview/api/AlignViewportI.java
+++ b/src/jalview/api/AlignViewportI.java
@@@ -26,7 -26,7 +26,8 @@@ import jalview.datamodel.AlignmentI
  import jalview.datamodel.AlignmentView;
  import jalview.datamodel.CigarArray;
  import jalview.datamodel.ColumnSelection;
 +import jalview.datamodel.ProfilesI;
+ import jalview.datamodel.SearchResultsI;
  import jalview.datamodel.SequenceCollectionI;
  import jalview.datamodel.SequenceGroup;
  import jalview.datamodel.SequenceI;
diff --cc src/jalview/viewmodel/AlignmentViewport.java
index 438eaf8,aa7cd12..fecccb0
--- a/src/jalview/viewmodel/AlignmentViewport.java
+++ b/src/jalview/viewmodel/AlignmentViewport.java
@@@ -36,8 -36,7 +36,8 @@@ import jalview.datamodel.Annotation
  import jalview.datamodel.CigarArray;
  import jalview.datamodel.ColumnSelection;
  import jalview.datamodel.HiddenSequences;
 +import jalview.datamodel.ProfilesI;
- import jalview.datamodel.SearchResults;
+ import jalview.datamodel.SearchResultsI;
  import jalview.datamodel.Sequence;
  import jalview.datamodel.SequenceCollectionI;
  import jalview.datamodel.SequenceGroup;