Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-tlf into FlexUnit4TestsTLF
Project: http://git-wip-us.apache.org/repos/asf/flex-tlf/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-tlf/commit/98bebb26 Tree: http://git-wip-us.apache.org/repos/asf/flex-tlf/tree/98bebb26 Diff: http://git-wip-us.apache.org/repos/asf/flex-tlf/diff/98bebb26 Branch: refs/heads/FlexUnit4TestsTLF Commit: 98bebb2697ffd85b1ebdbea757c0cfa356f74585 Parents: cad064e 592b45f Author: piotrz <piotrzarzyck...@gmail.com> Authored: Thu May 22 08:16:57 2014 +0200 Committer: piotrz <piotrzarzyck...@gmail.com> Committed: Thu May 22 08:16:57 2014 +0200 ---------------------------------------------------------------------- .../src/flashx/textLayout/compose/BaseCompose.as | 7 ++++--- .../src/flashx/textLayout/compose/ComposeState.as | 15 +++++++++------ .../textLayout/container/ContainerController.as | 1 + 3 files changed, 14 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
