From: Jim Procter Date: Wed, 3 Dec 2014 07:48:02 +0000 (+0000) Subject: Merge branch 'JAL-1517_release282' into Release_2_8_2_Branch X-Git-Tag: Release_2_8_2~1^2~2 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=bdf523fe1f6a27bc6d15dd697fa81d491f2e622f;hp=d5102e52d4916080702a8de11bf9927cee33fbc2;p=jalview.git Merge branch 'JAL-1517_release282' into Release_2_8_2_Branch --- diff --git a/utils/InstallAnywhere/Jalview.iap_xml b/utils/InstallAnywhere/Jalview.iap_xml index c938a0b..ecd0306 100755 --- a/utils/InstallAnywhere/Jalview.iap_xml +++ b/utils/InstallAnywhere/Jalview.iap_xml @@ -1,18 +1,18 @@ - - + DATE: Tue Dec 02 16:16:02 GMT 2014 --> + - - 49,53,46,48,32,80,114,111,102,101,115,115,105,111,110,97,108,32,66,117,105,108,100,32,52,53,51,56 + + 49,54,46,48,32,80,114,111,102,101,115,115,105,111,110,97,108,32,66,117,105,108,100,32,52,55,56,51 12,42,11,85,78,76,73,67,69,78,83,69,68 - 3,13,71,76,105,110,117,120,44,32,50,46,54,46,51,50,45,50,55,57,46,50,50,46,49,46,101,108,54,46,120,56,54,95,54,52,44,32,97,109,100,54,52,59,32,74,97,118,97,32,49,46,55,46,48,95,50,53,44,32,79,114,97,99,108,101,32,67,111,114,112,111,114,97,116,105,111,110,44,32,104,116,116,112,58,47,47,106,97,118,97,46,111,114,97,99,108,101,46,99,111,109,47,59,32,101,110,44,32,85,110,107,110,111,119,110,59,32,73,83,79,45,56,56,53,57,45,49 + 3,13,71,76,105,110,117,120,44,32,50,46,54,46,51,50,45,51,53,56,46,54,46,50,46,101,108,54,46,120,56,54,95,54,52,44,32,97,109,100,54,52,59,32,74,97,118,97,32,49,46,55,46,48,95,54,48,44,32,79,114,97,99,108,101,32,67,111,114,112,111,114,97,116,105,111,110,44,32,104,116,116,112,58,47,47,106,97,118,97,46,111,114,97,99,108,101,46,99,111,109,47,59,32,101,110,44,32,85,110,107,110,111,119,110,59,32,73,83,79,45,56,56,53,57,45,49 - 1,0,0,64,29,-4,96,96,80,127,118,101,93,105,116,96,121,48,48,49,56,52,67,98,113,112,112,37,82,101,96,63,55,-11,2,0,1,84,19,2,1,0,0 + 1,0,0,64,13,-64,-128,0,80,127,118,101,93,105,116,96,121,48,48,49,56,52,67,98,113,112,112,37,82,101,96,63,55,-11,2,9,1,105,27,10,1,0,0 - + false @@ -1042,110 +1042,110 @@ and any path to a file to save to the file]]> - - - - false - - - true - - - true - - - - - - - - - - - - false - - - - - - true - - - true - - - true - - - - - - 348699 - - - false - - - 0 - - - - - - - - - - false - - - true - - - true - - - - - - - - - - - - false - - - - - - true - - - true - - - true - - - - - - 348699 - - - false - - - 0 - - - - - - + + + + false + + + true + + + true + + + + + + + + + + + + false + + + + + + true + + + true + + + true + + + + + + 348699 + + + false + + + 0 + + + + + + + + + + false + + + true + + + true + + + + + + + + + + + + false + + + + + + true + + + true + + + true + + + + + + 348699 + + + false + + + 0 + + + + + + @@ -2069,7 +2069,59 @@ and any path to a file to save to the file]]> - 382442 + 49768 + + + false + + + 0 + + + + + + + + + + false + + + true + + + true + + + + + + + + + + + + false + + + + + + true + + + true + + + true + + + + + + 16046 false @@ -2894,10 +2946,13 @@ Press "Done" to quit the installer.]]> true - false + true + + + - 13 + 10 21 @@ -2931,7 +2986,7 @@ Press "Done" to quit the installer.]]> true - + 10 @@ -2965,7 +3020,7 @@ Press "Done" to quit the installer.]]> true - true + false @@ -3042,13 +3097,13 @@ Press "Done" to quit the installer.]]> true - + 10 - 21 + 20 90 @@ -3079,7 +3134,7 @@ Press "Done" to quit the installer.]]> true - + 10 @@ -3144,13 +3199,13 @@ Press "Done" to quit the installer.]]> - false + true true - + 10 @@ -3215,16 +3270,19 @@ Press "Done" to quit the installer.]]> - false + true - false + true + + + 10 - 21 + 20 90 @@ -4193,7 +4251,7 @@ Press "Done" to quit the installer.]]> true - + @@ -4315,7 +4373,7 @@ Press "Done" to quit the installer.]]> - + @@ -4387,7 +4445,7 @@ Press "Done" to quit the installer.]]> - + @@ -4411,7 +4469,7 @@ Press "Done" to quit the installer.]]> - + @@ -4668,13 +4726,20 @@ Press "Done" to quit the installer.]]> 8 - 0 + 2 0 + + + + + + + @@ -4695,7 +4760,7 @@ Press "Done" to quit the installer.]]> - + @@ -5688,6 +5753,80 @@ This will remove features installed by InstallAnywhere. It will not remove file false + + + + false + + + + + + + + + + false + + + + + 1 + + + 0 + + + 0 + + + 0 + + + + + + + 1 + + + 0 + + + 0 + + + 0 + + + + + + + + + + + + true + + + true + + + false + + + false + + + false + + + + + + @@ -6185,8 +6324,8 @@ and any path to a file to read from that file]]> - - + + @@ -6370,7 +6509,9 @@ and any path to a file to read from that file]]> - + + + false @@ -6872,7 +7013,6 @@ and any path to a file to read from that file]]> 0 - false @@ -6922,8 +7062,8 @@ and any path to a file to read from that file]]> - - + + @@ -6947,6 +7087,7 @@ and any path to a file to read from that file]]> +