Merge branch 'develop' into features/JAL-3010ontologyFeatureSettings
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 24 May 2019 14:29:31 +0000 (15:29 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 24 May 2019 14:29:31 +0000 (15:29 +0100)
commitc5c8a3619b093e1fb279ba7246d23e1f8033fb36
tree91bf1c24b4c61e170e298bb58cfedf3b98b6ed3d
parenta66e7b52d40674796339b3f45a5823f6cdb527fe
parent6d8f35fe16e99fb6083435b61cb80d18c4bc169b
Merge branch 'develop' into features/JAL-3010ontologyFeatureSettings
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/bin/Jalview.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/FeatureTypeSettings.java