Transferred from the Adobe Open Source Subversion Repository
Transferred from the Adobe Open Source Subversion Repository

Revision: 15168
Author:   cframpto@adobe.com
Date:     2010-03-31T14:25:45.678862Z

Log Message: 
-----------
Merge 15130 from 4.x to trunk.  TLF Build 600 with TabStop fix.

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/bundles/en_US/docs/flashx.textLayout.operations.xml</path>
<path kind="dir" action="M">/flex/sdk/trunk</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/flex-config.xml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/ReleaseNotes.txt</path>
<path kind="file" action="D">/flex/sdk/trunk/frameworks/rsls/textLayout_1.1.0.597.swf</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/elements/TextFlow.as</path>
<path kind="file" copyfrom-path="/flex/sdk/branches/4.x/frameworks/rsls/textLayout_1.1.0.600.swf" copyfrom-rev="15130" action="A">/flex/sdk/trunk/frameworks/rsls/textLayout_1.1.0.600.swf</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/libs/textLayout.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/BuildInfo.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/formats/TextLayoutFormatValueHolder.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/air-config.xml</path>

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1289809 13f79535-47bb-0310-9956-ffa450edef68

danteinforno/flex-sdk,SlavaRa/flex-sdk,SlavaRa/flex-sdk,shyamalschandra/flex-sdk,apache/flex-sdk,danteinforno/flex-sdk,danteinforno/flex-sdk,adufilie/flex-sdk,adufilie/flex-sdk,adufilie/flex-sdk,SlavaRa/flex-sdk,adufilie/flex-sdk,adufilie/flex-sdk,apache/flex-sdk,SlavaRa/flex-sdk,apache/flex-sdk,apache/flex-sdk,shyamalschandra/flex-sdk,shyamalschandra/flex-sdk,shyamalschandra/flex-sdk,shyamalschandra/flex-sdk,apache/flex-sdk,SlavaRa/flex-sdk,apache/flex-sdk,adufilie/flex-sdk,shyamalschandra/flex-sdk,danteinforno/flex-sdk,SlavaRa/flex-sdk,danteinforno/flex-sdk,danteinforno/flex-sdk