Merge branch 'develop' into trialMerge
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 6 Jun 2019 14:10:48 +0000 (15:10 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 6 Jun 2019 14:10:48 +0000 (15:10 +0100)
commit91e47ada7d1216e06dfcf2c32c7d2be396654455
tree45262065cff6bf7f9bdc3f660fa6a122cd789aa1
parentc5c8a3619b093e1fb279ba7246d23e1f8033fb36
parent1413ed295402b90cccddc8ee814cb5be0d1fc75e
Merge branch 'develop' into trialMerge
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/bin/Jalview.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/FeatureTypeSettings.java