Merge branch 'FLEX-33451' into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/d7a7a692 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/d7a7a692 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/d7a7a692 Branch: refs/heads/develop Commit: d7a7a6925e4f4c391d3b422eeb551a5efa43c80f Parents: 6632500 e5e1ab3 Author: Frédéric THOMAS <[email protected]> Authored: Fri Apr 5 13:54:49 2013 +0200 Committer: Frédéric THOMAS <[email protected]> Committed: Fri Apr 5 13:54:49 2013 +0200 ---------------------------------------------------------------------- .gitignore | 6 +++++- frameworks/build.xml | 3 +++ frameworks/projects/textLayout/build.xml | 24 ++++++++++++------------ 3 files changed, 20 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/d7a7a692/.gitignore ----------------------------------------------------------------------
