From: hansonr <hansonr@STO24954W.ad.stolaf.edu>
Date: Wed, 31 Oct 2018 06:04:36 +0000 (-0500)
Subject: JAXB upgrade; URLConnection.getResourceCode()
X-Git-Tag: Release_2_11_4_0~45^2~18^2~435^2~2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a11ce31b3e8ff7571b0e95e11758bbcfa2821596;p=jalview.git

JAXB upgrade; URLConnection.getResourceCode()

Conflicts:
	swingjs/SwingJS-site.zip
	swingjs/net.sf.j2s.core.jar
	swingjs/timestamp
	swingjs/ver/3.2.4/SwingJS-site.zip
	swingjs/ver/3.2.4/net.sf.j2s.core.jar
	swingjs/ver/3.2.4/timestamp
---

diff --git a/swingjs/SwingJS-site.zip b/swingjs/SwingJS-site.zip
index a3a1798..6fabf40 100644
Binary files a/swingjs/SwingJS-site.zip and b/swingjs/SwingJS-site.zip differ
diff --git a/swingjs/net.sf.j2s.core.jar b/swingjs/net.sf.j2s.core.jar
index 4c3ed48..1cfdd86 100644
Binary files a/swingjs/net.sf.j2s.core.jar and b/swingjs/net.sf.j2s.core.jar differ
diff --git a/swingjs/timestamp b/swingjs/timestamp
index 2f593ad..60a3ccd 100644
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@ -1 +1 @@
-20180917232142 
+20181030183630 
\ No newline at end of file
diff --git a/swingjs/ver/3.2.4/SwingJS-site.zip b/swingjs/ver/3.2.4/SwingJS-site.zip
new file mode 100644
index 0000000..6fabf40
Binary files /dev/null and b/swingjs/ver/3.2.4/SwingJS-site.zip differ
diff --git a/swingjs/ver/3.2.4/net.sf.j2s.core.jar b/swingjs/ver/3.2.4/net.sf.j2s.core.jar
new file mode 100644
index 0000000..1cfdd86
Binary files /dev/null and b/swingjs/ver/3.2.4/net.sf.j2s.core.jar differ
diff --git a/swingjs/ver/3.2.4/timestamp b/swingjs/ver/3.2.4/timestamp
new file mode 100644
index 0000000..d6f548b
--- /dev/null
+++ b/swingjs/ver/3.2.4/timestamp
@@ -0,0 +1 @@
+20181030183630