git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: ac1d516)
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)
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


No differences found