Merge branch 'JAL-1139_proguard' into develop

Conflicts:
	lib/Jmol-12.2.4.jar

diff --git a/appletlib/JmolApplet-12.2.4.jar b/appletlib/JmolApplet-12.2.4.jar
index aeecb80..e17c4ac 100644 (file)
Binary files a/appletlib/JmolApplet-12.2.4.jar and b/appletlib/JmolApplet-12.2.4.jar differ

diff --git a/build.xml b/build.xml
index 9f6867e..136ca1d 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -233,7 +233,7 @@
 
        <target name="makefulldist" depends="makedist">
                <!-- the default keystore details might need to be edited here -->
-               <signjar storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false">
+               <signjar storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false" sigalg="SHA1withRSA">
 
                        <fileset dir="${packageDir}">
                                <include name="*.jar" />

diff --git a/lib/Jmol-12.2.4.jar b/lib/Jmol-12.2.4.jar
index 39019b4..f1254cd 100644 (file)
Binary files a/lib/Jmol-12.2.4.jar and b/lib/Jmol-12.2.4.jar differ