From: hansonr Date: Thu, 1 Nov 2018 11:21:32 +0000 (-0500) Subject: JAXB upgrade for package-info.java namespace X-Git-Tag: Release_2_11_4_0~45^2~18^2~434^2 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=5327042013f9d3b51c3f15e5f567e7bb11e32dfe;p=jalview.git JAXB upgrade for package-info.java namespace --- diff --git a/swingjs/SwingJS-site.zip b/swingjs/SwingJS-site.zip index 6fabf40..e69de29 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 1cfdd86..e69de29 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 d6f548b..170a61e 100644 --- a/swingjs/timestamp +++ b/swingjs/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) diff --git a/swingjs/ver/3.2.4/SwingJS-site.zip b/swingjs/ver/3.2.4/SwingJS-site.zip index 6fabf40..e69de29 100644 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 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 --- 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)