Author: jmclean
Date: Sun Jan 10 01:08:06 2016
New Revision: 1723897

URL: http://svn.apache.org/viewvc?rev=1723897&view=rev
Log:
Update FP MD5 hashes look like merge failed

Modified:
    flex/site/trunk/content/installer/sdk-installer-config-4.0.xml

Modified: flex/site/trunk/content/installer/sdk-installer-config-4.0.xml
URL: 
http://svn.apache.org/viewvc/flex/site/trunk/content/installer/sdk-installer-config-4.0.xml?rev=1723897&r1=1723896&r2=1723897&view=diff
==============================================================================
--- flex/site/trunk/content/installer/sdk-installer-config-4.0.xml (original)
+++ flex/site/trunk/content/installer/sdk-installer-config-4.0.xml Sun Jan 10 
01:08:06 2016
@@ -539,7 +539,7 @@ limitations under the License.
                 <folder 
id="flash.sdk.folder.18.0">get/flashplayer/updaters/18/</folder>
                 <path 
id="flash.sdk.path.18.0">http://fpdownload.macromedia.com/get/flashplayer/updaters/18/</path>
                 <file id="flash.sdk.file.18.0">playerglobal18_0.swc</file>
-                <md5 
id="flash.sdk.md5.18.0">7451e9a7e6296c6a09022f42adcf57a5</md5>
+                <md5 
id="flash.sdk.md5.18.0">42c1b82c0383ce7baf763d476b6fc5a6</md5>
                 <swfversion id="flash.sdk.swfversion.18.0">29</swfversion>
             </versionS>
             <versionT id="flash.sdk.version.19.0" version="19.0" 
displayVersion="19" cacheID="5f215-523a055932740">
@@ -547,16 +547,16 @@ limitations under the License.
                 <folder 
id="flash.sdk.folder.19.0">get/flashplayer/updaters/19/</folder>
                 <path 
id="flash.sdk.path.19.0">http://fpdownload.macromedia.com/get/flashplayer/updaters/19/</path>
                 <file id="flash.sdk.file.19.0">playerglobal19_0.swc</file>
-                <md5 
id="flash.sdk.md5.19.0">e2e67b0851afaa512c2e2f31c43d5fba</md5>
+                <md5 
id="flash.sdk.md5.19.0">3f2473dd35a55427886abfc1807eaa98</md5>
                 <swfversion id="flash.sdk.swfversion.19.0">30</swfversion>
             </versionT>
             <!-- use versionID if more than one entry has the same version 
attribute -->
-            <versionU id="flash.sdk.version.20.0" version="20.0" 
displayVersion="20.0" cacheID="5ed79-5270830122521" 
cacheID2="5ed85-526906278df62">
+            <versionU id="flash.sdk.version.20.0" version="20.0" 
displayVersion="20" cacheID="5ed79-5270830122521" 
cacheID2="5ed85-526906278df62">
                 <server 
id="flash.sdk.server.20.0">http://fpdownload.macromedia.com</server>
                 <folder 
id="flash.sdk.folder.20.0">get/flashplayer/updaters/20/</folder>
                 <path 
id="flash.sdk.path.20.0">http://fpdownload.macromedia.com/get/flashplayer/updaters/20/</path>
                 <file id="flash.sdk.file.20.0">playerglobal20_0.swc</file>
-                <md5 
id="flash.sdk.md5.20.0">d308cdf324f086e7b2f0c1317f698c0c</md5>
+                <md5 
id="flash.sdk.md5.20.0">a6723a6812c89de307b6c76eca32968f</md5>
                 <swfversion id="flash.sdk.swfversion.20.0">31</swfversion>
             </versionU>
         </versions>


Reply via email to