You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2013/04/12 10:29:28 UTC

[13/13] git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into telemetry

Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into telemetry


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

Branch: refs/heads/develop
Commit: c4a1fcb00ea04058a85d2597f990fb5e1df27d12
Parents: e97c303 e005684
Author: Justin Mclean <jm...@apache.org>
Authored: Fri Apr 12 18:22:59 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri Apr 12 18:22:59 2013 +1000

----------------------------------------------------------------------
 modules/asc/build/java/build.xml                   |    8 +-
 .../src/java/macromedia/asc/embedding/Main.java    |    4 +-
 .../asc/src/java/macromedia/asc/util/Version.java  |   70 +++++++++++----
 3 files changed, 58 insertions(+), 24 deletions(-)
----------------------------------------------------------------------