git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cbc07ea bf0d052)
Merge branch 'features/JAL-1956_featureStyles' into merge_JAL-1956
authorJim Procter <jprocter@issues.jalview.org>
Tue, 21 Jun 2016 13:53:15 +0000 (14:53 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 21 Jun 2016 13:53:15 +0000 (14:53 +0100)
1  2 
src/jalview/gui/Jalview2XML.java patch | diff1 | diff2 | blob | history
test/jalview/io/FeaturesFileTest.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/gui/Jalview2XML.java
Simple merge
diff --cc test/jalview/io/FeaturesFileTest.java
Simple merge