Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' into
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 17 Dec 2018 17:25:49 +0000 (17:25 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 17 Dec 2018 17:25:49 +0000 (17:25 +0000)
commit1d01c9f62d4a2d2070d1296abe79a1e0dc7a3d7d
tree4fb01ad9bc55f3ee5a3c6fcb328615124e6d39a9
parentbd7b3138379c2db8507fe7e8d25f5a921e2d9df7
parent4b527101d4272edd16a94be664bc3b4761bbd185
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' into
JAL-3048dialogRunner2

Conflicts:
src/jalview/io/JalviewFileChooser.java
src/jalview/gui/ImageExporter.java
src/jalview/io/HtmlSvgOutput.java
src/jalview/io/JalviewFileChooser.java