Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git...

diff --git a/.classpath.js b/.classpath.js
index 5075b84..70fee04 100644 (file)
--- a/.classpath.js
+++ b/.classpath.js
@@ -64,12 +64,12 @@
        <classpathentry kind="lib" path="lib/jetty-http-9.2.10.v20150310.jar"/>
        <classpathentry kind="lib" path="lib/jetty-io-9.2.10.v20150310.jar"/>
        <classpathentry kind="lib" path="lib/java-json.jar"/>
-       <classpathentry kind="lib" path="lib/Jmol-14.6.4_2016.10.26.jar"/>
        <classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
        <classpathentry kind="lib" path="lib/biojava-core-4.1.0.jar"/>
        <classpathentry kind="lib" path="lib/biojava-ontology-4.1.0.jar"/>
        <classpathentry kind="lib" path="lib/htsjdk-2.12.0.jar"/>
        <classpathentry kind="lib" path="lib/groovy-all-2.4.12-indy.jar"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+        <classpathentry kind="lib" path="lib/Jmol-14.29.17.jar"/>
        <classpathentry kind="output" path="classes"/>
 </classpath>

diff --git a/swingjs/SwingJS-site.zip b/swingjs/SwingJS-site.zip
index b10f638..3077781 100644 (file)
Binary files a/swingjs/SwingJS-site.zip and b/swingjs/SwingJS-site.zip differ

diff --git a/swingjs/ver/3.2.1/SwingJS-site.zip b/swingjs/ver/3.2.1/SwingJS-site.zip
index b10f638..3077781 100644 (file)
Binary files a/swingjs/ver/3.2.1/SwingJS-site.zip and b/swingjs/ver/3.2.1/SwingJS-site.zip differ