git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f1aa6ca 691798c)
Merge branch 'Release_2_7_Branch_hotfix_JAL-962' into develop
authorjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 21 Oct 2011 12:13:45 +0000 (13:13 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 21 Oct 2011 12:13:45 +0000 (13:13 +0100)
1  2 
src/jalview/appletgui/AlignFrame.java patch | diff1 | diff2 | blob | history
src/jalview/appletgui/FeatureRenderer.java patch | diff1 | diff2 | blob | history
src/jalview/appletgui/FeatureSettings.java patch | diff1 | diff2 | blob | history
src/jalview/bin/JalviewLite.java patch | diff1 | diff2 | blob | history
src/jalview/javascript/JalviewLiteJsApi.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/appletgui/AlignFrame.java
Simple merge
diff --cc src/jalview/bin/JalviewLite.java
Simple merge