Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' into
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 18 Dec 2018 12:31:57 +0000 (12:31 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 18 Dec 2018 12:31:57 +0000 (12:31 +0000)
commit8e73dcd57f5558b39b3f431667457d78a3cec427
tree1600258917f4cad818f020130b661d1fa8bcf37f
parent1d01c9f62d4a2d2070d1296abe79a1e0dc7a3d7d
parent0a823fdcaff3ebc383b9edb956db6745f645acd9
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' into
JAL-3048dialogRunner2

Conflicts:
test/jalview/util/dialogrunner/DialogRunnerTest.java
src/jalview/gui/FeatureSettings.java
test/jalview/util/dialogrunner/DialogRunnerTest.java