From: hansonr <hansonr@STO24954W.ad.stolaf.edu>
Date: Sun, 22 Jul 2018 19:44:06 +0000 (-0500)
Subject: JAL-3026 upgrades Jmol to 14.29.17 for Java.
X-Git-Tag: Release_2_11_4_0~45^2~18^2~515
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=969e3bbe4a9d346b0fc6b50b50b7650f6ae2746f;p=jalview.git

JAL-3026 upgrades Jmol to 14.29.17 for Java.
---

diff --git a/.classpath b/.classpath
index b7d213b..fe6fbcc 100644
--- a/.classpath
+++ b/.classpath
@@ -62,7 +62,6 @@
 	<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"/>
@@ -70,5 +69,6 @@
 	<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 exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
+	<classpathentry kind="lib" path="lib/Jmol-14.29.17.jar"/>
 	<classpathentry kind="output" path="classes"/>
 </classpath>
diff --git a/lib/Jmol-14.29.17.jar b/lib/Jmol-14.29.17.jar
new file mode 100644
index 0000000..136eb93
Binary files /dev/null and b/lib/Jmol-14.29.17.jar differ
diff --git a/lib/Jmol-14.6.4_2016.10.26.jar b/unused/Jmol-14.6.4_2016.10.26.jar
similarity index 100%
rename from lib/Jmol-14.6.4_2016.10.26.jar
rename to unused/Jmol-14.6.4_2016.10.26.jar