Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-tlf into
develop
Conflicts:
build.xml
Project: http://git-wip-us.apache.org/repos/asf/flex-tlf/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-tlf/commit/251c27a4
Tree: http://git-wip-us.apache.org/repos/asf/flex-tlf/tree/251c27a4
Diff: http://git-wip-us.apache.org/repos/asf/flex-tlf/diff/251c27a4
Branch: refs/heads/tables
Commit: 251c27a4a44c1964a7b6619aaede6881aa8df266
Parents: 9c449d8 b61dda3
Author: piotrz <[email protected]>
Authored: Mon Oct 20 21:00:28 2014 +0200
Committer: piotrz <[email protected]>
Committed: Mon Oct 20 21:00:28 2014 +0200
----------------------------------------------------------------------
automation_tests/src/AllTestsSuite.as | 2 +
.../src/UnitTest/Tests/GeneralFunctionsTest.as | 2673 +++++++++---------
build.properties | 37 +
.../textLayout/container/ContainerController.as | 129 +-
.../src/flashx/textLayout/edit/TextClipboard.as | 15 +-
.../flashx/textLayout/utils/NavigationUtil.as | 3 +-
6 files changed, 1462 insertions(+), 1397 deletions(-)
----------------------------------------------------------------------
