Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of
authorhansonr <hansonr@STO24954W.ad.stolaf.edu>
Sun, 11 Nov 2018 20:35:27 +0000 (14:35 -0600)
committerhansonr <hansonr@STO24954W.ad.stolaf.edu>
Sun, 11 Nov 2018 20:35:27 +0000 (14:35 -0600)
commit7294fd3a5724366bd662ace3dbb28a5fbe182943
tree552cac80864ff221ab48cc541b8b7b73b7432083
parent9e98f12eb82f8f30c81c224a19131eb8dca1464d
parentf03b7f83651d88945df5399a4e5a3e1848293463
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