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

Revision: 15011
Author:   cframpto@adobe.com
Date:     2010-03-25T00:53:17.253767Z

Log Message: 
-----------
Merge changes 14914,14929,14952,14961,14987  from 4.x to trunk.  Includes TLF1.1 Build 587 and mirroring changes.

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/airframework/src/mx/core/Window.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/bundles/en_US/docs/flashx.textLayout.container.xml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/undo/UndoManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/compose/SimpleCompose.as</path>
<path kind="file" action="D">/flex/sdk/trunk/frameworks/rsls/textLayout_1.0.0.595.swf</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/bundles/en_US/docs/flashx.undo.xml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/factory/TextLineFactoryBase.as</path>
<path kind="file" copyfrom-path="/flex/sdk/branches/4.x/frameworks/rsls/textLayout_1.1.0.597.swf" copyfrom-rev="14952" action="A">/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/conversion/TextLayoutImporter.as</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/elements/FlowElement.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/elements/GlobalSettings.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/edit/IMEClient.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/formats/TextLayoutFormatInc.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/projects/textLayout/src/flashx/textLayout/elements/InlineGraphicElement.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/air-config.xml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/container/TextContainerManager.as</path>
<path kind="dir" action="M">/flex/sdk/trunk</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/edit/SelectionManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/formats/TextLayoutFormat.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/bundles/en_US/docs/flashx.textLayout.compose.xml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/ReleaseNotes.txt</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/container/ContainerController.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/formats/ITabStopFormat.as</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/compose/ComposeState.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/conversion/HtmlImporter.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/bundles/en_US/docs/flashx.textLayout.formats.xml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/operations/InsertTextOperation.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/bundles/en_US/docs/flashx.textLayout.elements.xml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/formats/ITextLayoutFormat.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/elements/SubParagraphGroupElement.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/factory/StringTextLineFactory.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/elements/LinkElement.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/elements/FlowLeafElement.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/bundles/en_US/docs/flashx.textLayout.conversion.xml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/elements/SpanElement.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/elements/TextFlow.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/factory/TextFlowTextLineFactory.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/compose/TextFlowLine.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/compose/TextLineRecycler.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/formats/TabStopFormatInc.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/elements/ParagraphElement.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/formats/TabStopFormat.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/conversion/TextConverter.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/edit/EditManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/compose/StandardFlowComposer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/compose/BaseCompose.as</path>
<path kind="file" copyfrom-path="/flex/sdk/branches/4.x/frameworks/projects/textLayout/src/flashx/textLayout/utils/Twips.as" copyfrom-rev="14952" action="A">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/utils/Twips.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/property/Property.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/elements/FlowGroupElement.as</path>

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

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