Merge branch 'test_paolo_JAL-1065' into Tcoffee_JAL-1065
authorjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 4 May 2012 16:08:21 +0000 (17:08 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 4 May 2012 16:08:21 +0000 (17:08 +0100)
commit6a3f4318037072a77588afb951a5a53835d5da99
treeebec88294d4cbc3b46b0387b95f59429b678d0da
parent1379350f04bc63ca05bd428afb86717c4764755d
parenta4d38d2999a99ce69424eb3e8090977a624bb5b0
Merge branch 'test_paolo_JAL-1065' into Tcoffee_JAL-1065

Conflicts:
src/jalview/appletgui/AlignFrame.java
src/jalview/gui/AlignFrame.java
updated handler methods for creating colourscheme for new 'jalviewish' approach to storing tcoffee scores.
src/jalview/appletgui/AlignFrame.java
src/jalview/gui/AlignFrame.java
src/jalview/io/TCoffeeScoreFile.java