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)
commit7e207b38944654b23b1dffe17c50bee095573176
tree9f28ff49e6df32d747879b013694b37c82952930
parent1ed1e912bfd2b5123fcd0395581adf117f5bbaff
parent5e1f568e89eb53559f2c66bd2ac7292fb8c56349
Merge branch 'bug/JAL-3141_backupfiles_prefs_widget_disable_bug' into merge/develop_backupfilefix/JAL-3141_remove_saveproject_and_fix_buglet

Merging three unmerged commits
src/jalview/gui/Desktop.java
src/jalview/jbgui/GDesktop.java