git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9dc751d 34348a4)
Merge branch 'r281_JAL-1211' into Release_2_8_1_Branch
authorJim Procter <jprocter@dundee.ac.uk>
Sat, 5 Apr 2014 12:23:27 +0000 (13:23 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Sat, 5 Apr 2014 12:23:27 +0000 (13:23 +0100)
1  2 
src/jalview/appletgui/AlignFrame.java patch | diff1 | diff2 | blob | history
src/jalview/gui/Desktop.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/appletgui/AlignFrame.java
Simple merge
diff --cc src/jalview/gui/Desktop.java
Simple merge