Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 1 Nov 2018 11:33:44 +0000 (11:33 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 1 Nov 2018 11:33:44 +0000 (11:33 +0000)
commite487d26a09d057abb5881935f51beccbf22fb5dc
treeb8a212551fc10e01bada85195146431cff28521e
parente58d21a916e1beda1091e286723afb494ab62cc3
parent5327042013f9d3b51c3f15e5f567e7bb11e32dfe
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:
swingjs/timestamp
swingjs/timestamp