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

diff --git a/swingjs/SwingJS-site.zip b/swingjs/SwingJS-site.zip
index 6fabf40..e69de29 100644 (file)
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 1cfdd86..e69de29 100644 (file)
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 854d7fa..02f774c 100644 (file)
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@ -1 +1 @@
-20181030183630
\ No newline at end of file
+20181101060953
\ 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
index 6fabf40..e69de29 100644 (file)
Binary files a/swingjs/ver/3.2.4/SwingJS-site.zip 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
index 1cfdd86..e69de29 100644 (file)
Binary files a/swingjs/ver/3.2.4/net.sf.j2s.core.jar 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
index d6f548b..170a61e 100644 (file)
--- a/swingjs/ver/3.2.4/timestamp
+++ b/swingjs/ver/3.2.4/timestamp
@@ -1 +1,5 @@
+<<<<<<< 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)