From: hansonr Date: Sat, 22 Dec 2018 18:49:52 +0000 (-0600) Subject: Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git... X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~68^2~334 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e07017f606a3c6cb26e75ef117c27698cd307fa8;hp=47ca18b4cfc7db54fc55a91fe5f0d61be989abf8;p=jalview.git 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 --- diff --git a/swingjs/SwingJS-site.zip b/swingjs/SwingJS-site.zip index be27711..84c9ddc 100644 Binary files a/swingjs/SwingJS-site.zip and b/swingjs/SwingJS-site.zip differ diff --git a/swingjs/timestamp b/swingjs/timestamp index 0ca0f07..57f6b92 100644 --- a/swingjs/timestamp +++ b/swingjs/timestamp @@ -1 +1 @@ -20181220202217 +20181222124810 diff --git a/swingjs/ver/3.2.4/SwingJS-site.zip b/swingjs/ver/3.2.4/SwingJS-site.zip index be27711..1cf7cf6 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/timestamp b/swingjs/ver/3.2.4/timestamp index 0ca0f07..57f6b92 100644 --- a/swingjs/ver/3.2.4/timestamp +++ b/swingjs/ver/3.2.4/timestamp @@ -1 +1 @@ -20181220202217 +20181222124810