From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 1 Nov 2018 11:33:44 +0000 (+0000)
Subject: Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of
X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~68^2~434
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e487d26a09d057abb5881935f51beccbf22fb5dc;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/timestamp
---

e487d26a09d057abb5881935f51beccbf22fb5dc
diff --cc swingjs/timestamp
index 854d7fa,170a61e..02f774c
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@@ -1,1 -1,5 +1,1 @@@
- 20181030183630
 -<<<<<<< Upstream, based on branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git
 -20181030183630 
 -=======
 -20181101060953 
 ->>>>>>> 8398157 JAXB upgrade for package-info namespace (only)
++20181101060953