Merge branch 'jims_annotate3d_update' into menard_finalsep2012
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Wed, 13 Feb 2013 19:26:01 +0000 (19:26 +0000)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Wed, 13 Feb 2013 19:26:01 +0000 (19:26 +0000)
commitac1d5169b86af13d4f06152a09cb125309ddf76f
treedea3a2e423f5596cf5d585b7ec494bae7c2e8de8
parent2bd43f464e725844b02a106c2d2f187c2c3655a6
parent1d4403dfba9413411408708a2d84d1b2b3f5b782
Merge branch 'jims_annotate3d_update' into menard_finalsep2012

JAL-1269 is fixed by this merge
Conflicts:
.classpath
src/jalview/appletgui/AlignFrame.java
src/jalview/io/RnamlFile.java
src/jalview/io/StockholmFile.java
src/jalview/io/TCoffeeScoreFile.java
src/jalview/renderer/AnnotationRenderer.java
test/jalview/io/TCoffeeScoreFileTest.java
.classpath
src/jalview/io/StockholmFile.java
src/jalview/io/TCoffeeScoreFile.java
src/jalview/renderer/AnnotationRenderer.java