Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk 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/37a33047 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/37a33047 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/37a33047 Branch: refs/heads/master Commit: 37a33047abbdb023d292a74bac06a2a925fd7f8d Parents: a415c7a cbb989b Author: mamsellem <maurice.amsel...@systar.com> Authored: Sat Mar 22 22:42:33 2014 +0100 Committer: mamsellem <maurice.amsel...@systar.com> Committed: Sat Mar 22 22:42:33 2014 +0100 ---------------------------------------------------------------------- .gitignore | 1 + flex-sdk-description.xml | 6 +-- .../src/spark/components/RichEditableText.as | 8 ++-- ide/flashbuilder/config/air-config.xml | 20 ++++---- ide/flashbuilder/config/flex-config.xml | 50 ++++++++++---------- 5 files changed, 44 insertions(+), 41 deletions(-) ----------------------------------------------------------------------
