Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of
authorhansonr <hansonr@STO24954W.ad.stolaf.edu>
Tue, 6 Nov 2018 01:38:12 +0000 (19:38 -0600)
committerhansonr <hansonr@STO24954W.ad.stolaf.edu>
Tue, 6 Nov 2018 01:38:12 +0000 (19:38 -0600)
commit20f1e88651d429e7cd49d5b1c76e11278663ac9e
treefbcb00858f06171f6f5c1b7115a22647d8277eb8
parentd14b06cdb877e90cd67b96cb3e7b580992dd8dab
parent59d9dfb7b746fcc396af9b572b40636028df9fed
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/SwingJS-site.zip
swingjs/timestamp
swingjs/ver/3.2.4/SwingJS-site.zip
swingjs/ver/3.2.4/timestamp
swingjs/SwingJS-site.zip
swingjs/timestamp
swingjs/ver/3.2.4/SwingJS-site.zip
swingjs/ver/3.2.4/timestamp