From: hansonr <hansonr@STO24954W.ad.stolaf.edu>
Date: Sun, 11 Nov 2018 20:35:27 +0000 (-0600)
Subject: Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of
X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~68^2~413
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=7dca28106288d1f2e6f05e09e348d76fd16f14e7;hp=7dca28106288d1f2e6f05e09e348d76fd16f14e7;p=jalview.git

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
---