From: Jim Procter <jprocter@compbio.dundee.ac.uk>
Date: Sun, 9 Jun 2013 18:35:50 +0000 (+0100)
Subject: Merge branch 'develop' into develop_m2_8_1_2
X-Git-Tag: Jalview_2_9~221^2^2~14
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8eb35a7bab22595255245c5136dd780816b98f26;p=jalview.git

Merge branch 'develop' into develop_m2_8_1_2
---

8eb35a7bab22595255245c5136dd780816b98f26
diff --cc src/MCview/PDBfile.java
index 90328e0,4d9d738..829eed7
--- a/src/MCview/PDBfile.java
+++ b/src/MCview/PDBfile.java
@@@ -24,9 -24,7 +24,8 @@@ import java.awt.*
  
  import jalview.analysis.AlignSeq;
  import jalview.datamodel.*;
 +import jalview.ext.jmol.PDBFileWithJmol;
  import jalview.io.FileParse;
- import jalview.ws.jws1.Annotate3D;
  
  public class PDBfile extends jalview.io.AlignFile
  {