From: hansonr <hansonr@STO24954W.ad.stolaf.edu>
Date: Tue, 6 Nov 2018 01:38:12 +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~428
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=20f1e88651d429e7cd49d5b1c76e11278663ac9e;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
---

20f1e88651d429e7cd49d5b1c76e11278663ac9e
diff --cc swingjs/SwingJS-site.zip
index 7774a16,c29d77b..e69de29
Binary files differ
diff --cc swingjs/timestamp
index 38bba3f,75fd0a4..5bd0bac
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +20181105193243 
++=======
+ 20181101233424 
++>>>>>>> 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 7774a16,c29d77b..e69de29
Binary files differ
diff --cc swingjs/ver/3.2.4/timestamp
index 38bba3f,75fd0a4..5bd0bac
--- a/swingjs/ver/3.2.4/timestamp
+++ b/swingjs/ver/3.2.4/timestamp
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +20181105193243 
++=======
+ 20181101233424 
++>>>>>>> branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git