Merge branches 'develop' and 'feature-autobuild/example-maven-dirs' of https://git-wip-us.apache.org/repos/asf/flex-asjs into feature-autobuild/example-maven-dirs
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1cb8e192 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1cb8e192 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1cb8e192 Branch: refs/heads/feature-autobuild/example-maven-dirs Commit: 1cb8e192b8b93d687dd0191a5f4674668142a28a Parents: ef3aaae a7d484d Author: Christofer Dutz <christofer.d...@codecentric.de> Authored: Thu Nov 10 09:09:42 2016 +0100 Committer: Christofer Dutz <christofer.d...@codecentric.de> Committed: Thu Nov 10 09:09:42 2016 +0100 ---------------------------------------------------------------------- build.xml | 39 ++++++++++++++++++++ examples/flexjs/DesktopMap/build.xml | 2 +- .../main/flex/org/apache/flex/core/UIBase.as | 3 +- 3 files changed, 42 insertions(+), 2 deletions(-) ----------------------------------------------------------------------