git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 82254ed 633ae27)
Merge branch 'bug/JAL-2536' into develop
authorJim Procter <jprocter@issues.jalview.org>
Mon, 29 May 2017 11:18:53 +0000 (12:18 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 29 May 2017 11:18:53 +0000 (12:18 +0100)
1  2 
src/jalview/gui/AlignFrame.java patch | diff1 | diff2 | blob | history
src/jalview/gui/Desktop.java patch | diff1 | diff2 | blob | history

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