Merge branch 'develop' into releases/Release_2_10_3_Branch releases/Release_2_10_3_Branch Release_2_10_3b1
authorJim Procter <jprocter@issues.jalview.org>
Wed, 24 Jan 2018 07:37:42 +0000 (07:37 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 24 Jan 2018 07:37:42 +0000 (07:37 +0000)
build.xml

index 4931cfb..a414491 100755 (executable)
--- a/build.xml
+++ b/build.xml
             <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>