Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' into
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 17 Dec 2018 14:20:27 +0000 (14:20 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 17 Dec 2018 14:20:27 +0000 (14:20 +0000)
commitbd7b3138379c2db8507fe7e8d25f5a921e2d9df7
treebf0230cdc31bf62839de91dcf284e6301e778797
parenta6db1aeb58e79d976b1e176103a3722ae7f28240
parent80e3ac6ebcb27e0d13ce639d1c3105f7cd6f83fe
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' into
JAL-3048dialogRunner2

Conflicts:
src/jalview/io/JalviewFileChooser.java
src/jalview/io/JalviewFileChooser.java