From: hansonr <hansonr@STO24954W.ad.stolaf.edu>
Date: Sun, 11 Nov 2018 20:36:41 +0000 (-0600)
Subject: Fixes for JInternalFrame, JAXB, String
X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~68^2~412
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=001991c5f64955e15cbad65c079e487f45ece834;p=jalview.git

Fixes for JInternalFrame, JAXB, String
---

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