Merge branch 'develop' into Jalview-BH/JAL-3026-JAL-3063-JAXB
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 17 Jan 2019 15:29:29 +0000 (15:29 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 17 Jan 2019 15:29:29 +0000 (15:29 +0000)
commit4c132b37c867a60959dae032addd78892d996345
treeb77be5392157f3fb6eac78bb86d02ed60d0da4d4
parent7fb89dadbc3eac97602fc84e519014582abe4649
parent3f62f10ab0f8985945e460c70c89b530446d6afa
Merge branch 'develop' into Jalview-BH/JAL-3026-JAL-3063-JAXB

Conflicts:
.gitignore
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/commands/EditCommand.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/ScalePanel.java
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/commands/EditCommand.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/FeatureTypeSettings.java
src/jalview/gui/OverviewCanvas.java
src/jalview/gui/ScalePanel.java
src/jalview/ws/DBRefFetcher.java
test/jalview/ext/jmol/JmolParserTest.java