From: jprocter <Jim Procter>
Date: Mon, 13 Sep 2010 19:03:37 +0000 (+0000)
Subject: patched Jmol and code for embedding JmolAppConsole in a JPanel (JAL-638)
X-Git-Tag: Release_2_6~47
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=aac22d1fe816d7f0399e227a3a2e6ad87a94beea;p=jalview.git

patched Jmol and code for embedding JmolAppConsole in a JPanel (JAL-638)
---

diff --git a/build.xml b/build.xml
index 3894e21..08cd98e 100755
--- a/build.xml
+++ b/build.xml
@@ -100,7 +100,7 @@
 		<property name="packageDir" value="dist" />
 		<property name="outputJar" value="jalview.jar" />
 		<!-- Jalview Applet JMol Jar Dependency -->
-		<property name="jmolJar" value="JmolApplet-12.1.5.jar" />
+		<property name="jmolJar" value="JmolApplet-12.1.11_dev_patched.jar" />
 		<property name="jalviewLiteJar" value="jalviewApplet.jar"/>
 		<!-- switch to indicate if we should obfuscate jalviewLite -->
 		<!--<property name="donotobfuscate" value="true"/> -->