Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 30 Jan 2019 16:05:51 +0000 (16:05 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 30 Jan 2019 16:05:51 +0000 (16:05 +0000)
commitc4cf7aa546ede43930f9a17fec5060119984da41
tree8bfacff8028a78bd5be4d4a3fc2f56c99d0722f3
parentc61be14a14793f4b5b6fab7099ee8a0e0b9da12b
parent654df20da058a725ba0f5bf7153921fbf5b92608
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of
https://source.jalview.org/git/jalview.git into
Jalview-BH/JAL-3026-JAL-3063-JAXB

Conflicts:
src/jalview/gui/SequenceFetcher.java
src/jalview/gui/SequenceFetcher.java