git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b47c67a c356a2a)
Merge branch 'develop' into Release_2_9_0b1_Branch
authorJim Procter <jprocter@issues.jalview.org>
Tue, 22 Sep 2015 14:25:40 +0000 (15:25 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 22 Sep 2015 14:25:40 +0000 (15:25 +0100)
1  2 
doc/UnitTesting.html patch | diff1 | diff2 | blob | history
help/html/io/export.html patch | diff1 | diff2 | blob | history
help/html/releases.html patch | diff1 | diff2 | blob | history
src/jalview/appletgui/AlignFrame.java patch | diff1 | diff2 | blob | history
src/jalview/appletgui/AnnotationColumnChooser.java patch | diff1 | diff2 | blob | history
src/jalview/appletgui/JVDialog.java patch | diff1 | diff2 | blob | history
src/jalview/bin/JalviewLite.java patch | diff1 | diff2 | blob | history
src/jalview/gui/AlignmentPanel.java patch | diff1 | diff2 | blob | history
test/jalview/gui/AnnotationChooserTest.java patch | diff1 | diff2 | blob | history
test/jalview/gui/FontChooserTest.java patch | diff1 | diff2 | blob | history

diff --cc doc/UnitTesting.html
Simple merge
diff --cc help/html/io/export.html
Simple merge
diff --cc help/html/releases.html
Simple merge
diff --cc src/jalview/appletgui/AlignFrame.java
Simple merge
diff --cc src/jalview/appletgui/JVDialog.java
Simple merge
diff --cc src/jalview/bin/JalviewLite.java
Simple merge
diff --cc src/jalview/gui/AlignmentPanel.java
Simple merge
diff --cc test/jalview/gui/FontChooserTest.java
Simple merge