From: Jim Procter <jprocter@issues.jalview.org>
Date: Tue, 29 Nov 2016 07:43:23 +0000 (+0000)
Subject: Merge branch 'develop' of http://source.jalview.org/git/jalview into develop
X-Git-Tag: Release_2_10_3b1~396^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b8e51a57f234e74e338057e6779819d3151531fa;hp=19424d4e1623bfcdcf30567f7a233fe81c4a9e4e;p=jalview.git

Merge branch 'develop' of source.jalview.org/git/jalview into develop
---

diff --git a/utils/InstallAnywhere/Jalview.iap_xml b/utils/InstallAnywhere/Jalview.iap_xml
index bf6eb0d..3cfc2bb 100755
--- a/utils/InstallAnywhere/Jalview.iap_xml
+++ b/utils/InstallAnywhere/Jalview.iap_xml
@@ -5270,7 +5270,7 @@ Press "Done" to quit the installer.]]></string>
 					</method>
 					<method name="put">
 						<string><![CDATA[com.zerog.ia.installer.options.valid.vm.list]]></string>
-						<string><![CDATA[1.7+]]></string>
+						<string><![CDATA[1.8+]]></string>
 					</method>
 					<method name="put">
 						<string><![CDATA[com.zerog.ia.project.build.last.date]]></string>
@@ -5366,7 +5366,7 @@ Press "Done" to quit the installer.]]></string>
 					</method>
 					<method name="put">
 						<string><![CDATA[com.zerog.ia.installer.options.platform.macosx.vm.version]]></string>
-						<string><![CDATA[1.7+]]></string>
+						<string><![CDATA[1.8+]]></string>
 					</method>
 					<method name="put">
 						<string><![CDATA[com.zerog.ia.build.platform.java.novm]]></string>