Merge branch 'develop' into trialMerge
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 28 May 2019 13:00:38 +0000 (14:00 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 28 May 2019 13:00:38 +0000 (14:00 +0100)
commitb419d3b17606d478c234678487ff34d97bfa83cc
tree99a2ad6c7a4f72fe2b9f67e324d9db99772d7e5e
parentb0716c75367a82443cd516ef3ea08708dacd92e9
parent3afd5366206029290da3e20a714343174bebdbf1
Merge branch 'develop' into trialMerge

Conflicts:
src/jalview/gui/FeatureTypeSettings.java
src/jalview/io/BackupFiles.java
src/jalview/jbgui/GPreferences.java
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/bin/Jalview.java
src/jalview/gui/APQHandlers.java
src/jalview/gui/Desktop.java
src/jalview/gui/FeatureTypeSettings.java
src/jalview/gui/JvSwingUtils.java
src/jalview/gui/Preferences.java
src/jalview/io/BackupFiles.java
src/jalview/jbgui/GDesktop.java
src/jalview/jbgui/GPreferences.java