You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jo...@apache.org on 2016/05/06 18:00:46 UTC
[4/4] git commit: [flex-falcon] [refs/heads/develop] - Merge branch
'develop' of https://git-wip-us.apache.org/repos/asf/flex-falcon into develop
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-falcon into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/097f6ba9
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/097f6ba9
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/097f6ba9
Branch: refs/heads/develop
Commit: 097f6ba91af3fa4865df5280ab20bdb661ba06c2
Parents: 86de6a6 70ebabf
Author: Josh Tynjala <jo...@gmail.com>
Authored: Fri May 6 10:56:43 2016 -0700
Committer: Josh Tynjala <jo...@gmail.com>
Committed: Fri May 6 10:56:43 2016 -0700
----------------------------------------------------------------------
compiler-jx/pom.xml | 4 ++--
externs/GCL/pom.xml | 3 +++
externs/cordova/pom.xml | 3 ++-
externs/createjs/pom.xml | 1 +
externs/google_maps/pom.xml | 3 ++-
externs/jasmine/pom.xml | 1 +
externs/jquery/pom.xml | 1 +
externs/js/pom.xml | 1 +
externs/node/pom.xml | 1 +
.../org/apache/flex/maven/flexjs/CompileASMojo.java | 5 ++++-
.../org/apache/flex/maven/flexjs/CompileJSMojo.java | 14 +-------------
.../src/main/resources/config/compile-js-config.xml | 8 ++++++--
installer.xml | 2 +-
13 files changed, 26 insertions(+), 21 deletions(-)
----------------------------------------------------------------------