From: Jim Procter <j.procter@dundee.ac.uk>
Date: Mon, 6 Oct 2014 15:33:17 +0000 (+0100)
Subject: Merge branch 'Release_2_8_2_Branch' into JAL-429_phylip-file-support
X-Git-Tag: Jalview_2_9~172^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=bdba25716eaa9492681532cb443c18ed34237488;p=jalview.git

Merge branch 'Release_2_8_2_Branch' into JAL-429_phylip-file-support

Conflicts:
	src/jalview/io/AppletFormatAdapter.java
---

bdba25716eaa9492681532cb443c18ed34237488
diff --cc src/jalview/io/AppletFormatAdapter.java
index d43e7c1,ce15f0e..ed49d5e
--- a/src/jalview/io/AppletFormatAdapter.java
+++ b/src/jalview/io/AppletFormatAdapter.java
@@@ -20,12 -20,6 +20,13 @@@
   */
  package jalview.io;
  
 +import jalview.api.AlignViewportI;
 +import jalview.datamodel.Alignment;
 +import jalview.datamodel.AlignmentAnnotation;
 +import jalview.datamodel.AlignmentI;
 +import jalview.datamodel.AlignmentView;
++import jalview.util.MessageManager;
 +
  import java.io.File;
  import java.io.InputStream;
  import java.util.List;