Merge branch 'features/JAL-1738_JAL-345_selectionfromhighlight' into develop
authorJim Procter <jprocter@issues.jalview.org>
Tue, 22 Nov 2016 12:45:31 +0000 (12:45 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 22 Nov 2016 12:45:31 +0000 (12:45 +0000)
1  2 
help/html/features/search.html
resources/lang/Messages.properties
src/jalview/api/AlignViewportI.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/SeqPanel.java
src/jalview/structure/StructureSelectionManager.java
src/jalview/viewmodel/AlignmentViewport.java

Simple merge
Simple merge
@@@ -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;
Simple merge
Simple merge
Simple merge
@@@ -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;