git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ed1e91 5e1f568)
Merge branch 'bug/JAL-3141_backupfiles_prefs_widget_disable_bug' into merge/develop_b...
authorBen Soares <bsoares@dundee.ac.uk>
Wed, 22 May 2019 11:18:01 +0000 (12:18 +0100)
committerBen Soares <bsoares@dundee.ac.uk>
Wed, 22 May 2019 11:18:01 +0000 (12:18 +0100)
Merging three unmerged commits

1  2 
src/jalview/gui/Desktop.java patch | diff1 | diff2 | blob | history
src/jalview/jbgui/GDesktop.java patch | diff1 | diff2 | blob | history

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