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: Release_2_11_4_0~45^2~18^2~412^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=7294fd3a5724366bd662ace3dbb28a5fbe182943;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
---

7294fd3a5724366bd662ace3dbb28a5fbe182943
diff --cc swingjs/SwingJS-site.zip
index 4e04670,cd73ff2..e69de29
Binary files differ
diff --cc swingjs/timestamp
index 3238936,f5785d8..0cd7c32
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +20181111143118 
++=======
+ 20181111141107 
++>>>>>>> branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git
diff --cc swingjs/ver/3.2.4/SwingJS-site.zip
index 4e04670,cd73ff2..e69de29
Binary files differ
diff --cc swingjs/ver/3.2.4/timestamp
index 3238936,f5785d8..0cd7c32
--- a/swingjs/ver/3.2.4/timestamp
+++ b/swingjs/ver/3.2.4/timestamp
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +20181111143118 
++=======
+ 20181111141107 
++>>>>>>> branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git