git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c5677e9 b1c9b42)
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)
1  2 
src/jalview/io/FeaturesFile.java patch | diff1 | diff2 | blob | history
src/jalview/io/TCoffeeScoreFile.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/io/FeaturesFile.java
Simple merge
diff --cc src/jalview/io/TCoffeeScoreFile.java
Simple merge