SwingJS-site and net.sf.j2s.core.jar

Note that this does include a new transpiler.

diff --git a/swingjs/SwingJS-site.zip b/swingjs/SwingJS-site.zip
index e69de29..78656bb 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 e69de29..e72f1b8 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 02f774c..2de5302 100644 (file)
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@ -1 +1 @@
-20181101060953
\ No newline at end of file
+20181101120131 

diff --git a/swingjs/ver/3.2.4/SwingJS-site.zip b/swingjs/ver/3.2.4/SwingJS-site.zip
index e69de29..78656bb 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 e69de29..e72f1b8 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 170a61e..2de5302 100644 (file)
--- a/swingjs/ver/3.2.4/timestamp
+++ b/swingjs/ver/3.2.4/timestamp
@@ -1,5 +1 @@
-<<<<<<< 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)
+20181101120131