Merge branch 'develop' into feature/JAL-2422ChimeraX
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 9 Mar 2020 15:05:32 +0000 (15:05 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 9 Mar 2020 15:05:32 +0000 (15:05 +0000)
commit09ec96d9ac0fd717d6cf32417d9916cca781d92c
tree646f591180b4ac8f253e154f8ad336e96119f064
parent9ae9207767c6ddad56fa405423935c924e959d93
parentb8c8a9017c9abd4cd0b2d685d34a3c4b7982d7ac
Merge branch 'develop' into feature/JAL-2422ChimeraX
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/appletgui/AlignFrame.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/Preferences.java
src/jalview/jbgui/GPreferences.java
src/jalview/project/Jalview2XML.java