Repository: flex-sdk Updated Branches: refs/heads/release4.12.0 ac55c8b52 -> 6fc0cfaa4
merge release4.12.0 branch to develop branch Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/7a3a280e Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/7a3a280e Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/7a3a280e Branch: refs/heads/release4.12.0 Commit: 7a3a280ed661f5ee670f1c701478b3e0adc5d2e1 Parents: 4a13999 ac55c8b Author: Alex Harui <aha...@apache.org> Authored: Thu May 1 10:58:56 2014 -0700 Committer: Alex Harui <aha...@apache.org> Committed: Thu May 1 10:58:56 2014 -0700 ---------------------------------------------------------------------- CONTRIBUTING | 26 ++++++++-------- README | 31 ++++++++++++-------- RELEASE_NOTES | 29 +++++++++++------- build.properties | 4 +-- .../framework/src/mx/core/FlexVersion.as | 2 +- .../framework/src/mx/styles/CSSDimension.as | 3 +- ide/flashbuilder/makeApacheFlexForIDE.bat | 16 +++++----- ide/flashbuilder/makeApacheFlexForIDE.sh | 10 +++---- .../compiler/common/MxmlConfiguration.java | 5 ++-- .../src/java/flex2/tools/VersionInfo.java | 2 +- 10 files changed, 72 insertions(+), 56 deletions(-) ----------------------------------------------------------------------
