From: Jim Procter <jprocter@issues.jalview.org>
Date: Wed, 24 Jan 2018 07:37:42 +0000 (+0000)
Subject: Merge branch 'develop' into releases/Release_2_10_3_Branch
X-Git-Tag: Release_2_10_3b1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Freleases%2FRelease_2_10_3_Branch;hp=82cba0a99ac7c16b89e8399adb158e6a063fecd3;p=jalview.git

Merge branch 'develop' into releases/Release_2_10_3_Branch
---

diff --git a/build.xml b/build.xml
index 4931cfb..a414491 100755
--- a/build.xml
+++ b/build.xml
@@ -431,13 +431,14 @@
             <exclude name="jalview.jar" />
             <include name="*.jar" />
             <include name="*_*.jar" />
-            <exclude name="*jnilib.jar" />
+            <exclude name="*quaqua*.jar" />
           </fileset>
           <property name="jalview.version" value="${JALVIEW_VERSION}" />
         </resources>
         <resources os="Mac OS X">
           <fileset dir="${packageDir}">
-            <include name="*quaqua*.jnilib.jar" />
+          	 <include name="quaqua-filechooser-only-8.0.jar"/>
+            <include name="*quaqua64*.jnilib.jar" />
           </fileset>
         </resources>