From: hansonr Date: Tue, 21 Aug 2018 13:00:09 +0000 (-0500) Subject: Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git... X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~68^2~472 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=656ce76d045046be5838626a4822a7fefd984040;hp=8ca1ac83b31ae44e8025b246800a4671f44cbb0c;p=jalview.git Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026 --- diff --git a/libjs/jmol-app.zip b/libjs/jmol-app.zip index 529daeb..c9c31a6 100644 Binary files a/libjs/jmol-app.zip and b/libjs/jmol-app.zip differ diff --git a/swingjs/SwingJS-site.zip b/swingjs/SwingJS-site.zip index 59ed2a4..8c81161 100644 Binary files a/swingjs/SwingJS-site.zip and b/swingjs/SwingJS-site.zip differ diff --git a/swingjs/timestamp b/swingjs/timestamp index d762baa..a1de09c 100644 --- a/swingjs/timestamp +++ b/swingjs/timestamp @@ -1 +1 @@ -20180821071128 +20180821075258 diff --git a/swingjs/ver/3.2.2/SwingJS-site.zip b/swingjs/ver/3.2.2/SwingJS-site.zip index 59ed2a4..8c81161 100644 Binary files a/swingjs/ver/3.2.2/SwingJS-site.zip and b/swingjs/ver/3.2.2/SwingJS-site.zip differ diff --git a/swingjs/ver/3.2.2/timestamp b/swingjs/ver/3.2.2/timestamp index d762baa..a1de09c 100644 --- a/swingjs/ver/3.2.2/timestamp +++ b/swingjs/ver/3.2.2/timestamp @@ -1 +1 @@ -20180821071128 +20180821075258