Merge remote-tracking branch 'origin/develop' 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/cbb989b2 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/cbb989b2 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/cbb989b2 Branch: refs/heads/release4.12.0 Commit: cbb989b21a66e8ddb1036439582aaf54258d173f Parents: eb510bf ce9e3b0 Author: piotrz <piotrzarzyck...@gmail.com> Authored: Sat Mar 22 22:24:17 2014 +0100 Committer: piotrz <piotrzarzyck...@gmail.com> Committed: Sat Mar 22 22:24:17 2014 +0100 ---------------------------------------------------------------------- .gitignore | 1 + CONTRIBUTING | 105 +++++++++++++++++++ README | 4 +- RELEASE_NOTES | 13 ++- build.xml | 1 + flex-sdk-description.xml | 6 +- .../AdvancedDataGridBase.as | 26 +++-- .../AdvancedDataGridColumn.as | 11 +- .../AdvancedDataGridColumnGroup.as | 2 +- .../controls/dataGridClasses/DataGridColumn.as | 11 +- frameworks/projects/spark/defaults.css | 3 - frameworks/themes/Spark/spark.css | 5 + ide/flashbuilder/config/air-config.xml | 20 ++-- ide/flashbuilder/config/flex-config.xml | 50 ++++----- 14 files changed, 191 insertions(+), 67 deletions(-) ----------------------------------------------------------------------