You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by bi...@apache.org on 2014/12/16 01:48:20 UTC

[6/6] git commit: [flex-sdk] [refs/heads/release4.14.0] - Merge commit '1884960242f835879f5ca6504659072a2305f120' into release4.14.0

Merge commit '1884960242f835879f5ca6504659072a2305f120' into release4.14.0


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/7a051584
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/7a051584
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/7a051584

Branch: refs/heads/release4.14.0
Commit: 7a051584552d332fc27e743b6ef83864a0737e53
Parents: 74225b2 1884960
Author: OmPrakash Muppirala <bi...@gmail.com>
Authored: Mon Dec 15 16:46:35 2014 -0800
Committer: OmPrakash Muppirala <bi...@gmail.com>
Committed: Mon Dec 15 16:46:35 2014 -0800

----------------------------------------------------------------------
 build.properties                                |  4 +-
 .../advancedgrids/src/mx/core/Version.as        |  2 +-
 .../airframework/src/mx/core/Version.as         |  2 +-
 .../projects/airspark/src/spark/core/Version.as |  2 +-
 frameworks/projects/apache/src/core/Version.as  |  2 +-
 .../projects/automation/src/mx/core/Version.as  |  2 +-
 .../automation_agent/src/mx/core/Version.as     |  2 +-
 .../automation_air/src/mx/core/Version.as       |  2 +-
 .../automation_dmv/src/mx/core/Version.as       |  2 +-
 .../src/mx/core/Version.as                      |  2 +-
 .../automation_spark/src/mx/core/Version.as     |  2 +-
 .../automation_spark/src/spark/core/Version.as  |  2 +-
 .../projects/charts/src/mx/core/Version.as      |  2 +-
 .../projects/framework/src/FrameworkClasses.as  |  1 +
 .../framework/src/mx/core/FlexVersion.as        | 16 ++++++-
 .../projects/framework/src/mx/core/Version.as   |  2 +-
 .../src/mx/resources/ResourceManagerImpl.as     |  3 ++
 .../src/mx/utils/LegacyMobileThemeOverride.as   | 47 ++++++++++++++++++++
 frameworks/projects/mx/src/mx/core/Version.as   |  2 +-
 frameworks/projects/rpc/src/mx/core/Version.as  |  2 +-
 .../projects/spark/src/spark/core/Version.as    |  2 +-
 .../spark_dmv/src/spark/core/Version.as         |  2 +-
 frameworks/projects/tool/src/mx/core/Version.as |  2 +-
 .../projects/tool_air/src/mx/core/Version.as    |  2 +-
 .../compiler/common/MxmlConfiguration.java      |  5 ++-
 .../src/java/flex2/tools/VersionInfo.java       |  2 +-
 .../ResourceManager_Methods_getString.mxml      | 13 ++++++
 27 files changed, 104 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7a051584/build.properties
----------------------------------------------------------------------