git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 77abb3f deff1a0)
Merge branch 'Release_2_8_2_Branch' into JAL-429_phylip-file-support
authorJim Procter <j.procter@dundee.ac.uk>
Mon, 6 Oct 2014 15:33:17 +0000 (16:33 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Mon, 6 Oct 2014 15:33:17 +0000 (16:33 +0100)
Conflicts:
src/jalview/io/AppletFormatAdapter.java

1  2 
src/jalview/io/AppletFormatAdapter.java patch | diff1 | diff2 | blob | history
src/jalview/io/FileParse.java patch | diff1 | diff2 | blob | history
src/jalview/io/JalviewFileChooser.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/io/AppletFormatAdapter.java
index d43e7c1,ce15f0e..ed49d5e
--- 1/src/jalview/io/AppletFormatAdapter.java
--- 2/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;
diff --cc src/jalview/io/FileParse.java
Simple merge