fix merge conflicts for finess on JAL-1140 (introduced by 1a8f953dd71a9e319e910261927...
authorjprocter <jprocter@compbio.dundee.ac.uk>
Tue, 4 Dec 2012 16:11:26 +0000 (16:11 +0000)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Wed, 13 Feb 2013 18:56:58 +0000 (18:56 +0000)
commit2bd43f464e725844b02a106c2d2f187c2c3655a6
treebc58d6a9cee8f2bd4404f6d8d1936eef213714b5
parente54608848d1b11338d6ef287385ad818606bff16
fix merge conflicts for finess on JAL-1140 (introduced by 1a8f953dd71a9e319e910261927f269d69b4692c)
22 files changed:
src/MCview/PDBViewer.java
src/MCview/PDBfile.java
src/jalview/appletgui/AlignFrame.java
src/jalview/datamodel/Annotation.java
src/jalview/ext/jmol/PDBFileWithJmol.java
src/jalview/gui/AssociatePdbFileWithSeq.java
src/jalview/gui/PopupMenu.java
src/jalview/io/AlignFile.java
src/jalview/io/BLCFile.java
src/jalview/io/ClustalFile.java
src/jalview/io/FastaFile.java
src/jalview/io/FeaturesFile.java
src/jalview/io/JPredFile.java
src/jalview/io/MSFfile.java
src/jalview/io/PIRFile.java
src/jalview/io/PfamFile.java
src/jalview/io/PileUpfile.java
src/jalview/io/RnamlFile.java
src/jalview/io/SimpleBlastFile.java
src/jalview/io/StockholmFile.java
src/jalview/io/TCoffeeScoreFile.java
test/jalview/io/TCoffeeScoreFileTest.java