Merge branch 'develop' of https://source.jalview.org/git/jalview.git into menard
authorAnne Menard <menard.annec@gmail.com>
Mon, 16 Jul 2012 08:24:38 +0000 (10:24 +0200)
committerAnne Menard <menard.annec@gmail.com>
Mon, 16 Jul 2012 08:24:38 +0000 (10:24 +0200)
commit575a2cafa208004f49d91fe56da0fac56be60455
treeaca9a1b63bba767c7d7c1f8cf814ceea0613a12c
parentc5677e9860106a821a3e6e0429b20ede7b9a732a
parentb1c9b42f08c639868c2509dffacdf29f299c5f0d
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into menard
src/jalview/io/FeaturesFile.java
src/jalview/io/TCoffeeScoreFile.java