You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2016/11/08 15:26:05 UTC
[47/50] git commit: [flex-asjs]
[refs/heads/feature-autobuild/example-maven-dirs] - Merge remote-tracking
branch 'origin/feature/mdl' into feature/mdl
Merge remote-tracking branch 'origin/feature/mdl' into feature/mdl
# Conflicts:
# examples/flexjs/MDLExample/.vscode/tasks.json
# examples/flexjs/MDLExample/src/main/flex/App.mxml
# frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a6ea45a7
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a6ea45a7
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a6ea45a7
Branch: refs/heads/feature-autobuild/example-maven-dirs
Commit: a6ea45a75243a6f17675dad3ba522ead94755797
Parents: 88bc82f 59b6d50
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Mon Nov 7 07:37:28 2016 +0100
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Mon Nov 7 07:37:28 2016 +0100
----------------------------------------------------------------------
distribution/jars/compc/pom.xml | 60 +++++++++++++++
distribution/jars/falcon-asc/pom.xml | 60 +++++++++++++++
distribution/jars/falcon-compc/pom.xml | 60 +++++++++++++++
distribution/jars/falcon-mxmlc/pom.xml | 60 +++++++++++++++
distribution/jars/falcon-optimizer/pom.xml | 60 +++++++++++++++
distribution/jars/falcon-swfdump/pom.xml | 65 ++++++++++++++++
distribution/jars/mxmlc/pom.xml | 60 +++++++++++++++
distribution/pom.xml | 55 +++++++++++++-
distribution/src/main/assembly/component.xml | 1 +
examples/flexjs/DesktopMap/pom.xml | 10 +++
examples/flexjs/MDLExample/.vscode/tasks.json | 7 +-
.../flexjs/MDLExample/src/main/flex/App.mxml | 5 ++
examples/flexjs/TeamPage/pom.xml | 13 ++--
examples/flexjs/pom.xml | 1 +
.../MaterialDesignLite/.vscode/tasks.json | 10 +++
.../main/flex/org/apache/flex/mdl/CardMenu.as | 80 ++++++++++++++++++++
.../src/main/flex/org/apache/flex/mdl/Spacer.as | 65 ++++++++++++++++
.../src/main/resources/mdl-manifest.xml | 4 +-
18 files changed, 665 insertions(+), 11 deletions(-)
----------------------------------------------------------------------