Merge branch 'develop' into feature/fontawesome
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2b4150a8 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2b4150a8 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2b4150a8 Branch: refs/heads/develop Commit: 2b4150a87d4a94623b2fbe15c9e864d4a81395b5 Parents: b516503 cf53944 Author: piotrz <pio...@apache.org> Authored: Sat Jan 7 00:56:20 2017 +0100 Committer: piotrz <pio...@apache.org> Committed: Sat Jan 7 00:56:20 2017 +0100 ---------------------------------------------------------------------- .../src/main/flex/DataBindingExample.mxml | 7 +- .../src/main/flex/MyInitialView.mxml | 9 +-- .../flexjs/MDLExample/src/main/flex/Badges.mxml | 51 +++++++++++++ .../src/main/flex/MainNavigation.mxml | 33 +------- .../src/main/config/compile-as-config.xml | 6 ++ .../src/main/resources/express-as-manifest.xml | 26 +++++++ .../src/main/resources/express-manifest.xml | 80 ++++++++++++++++++++ 7 files changed, 174 insertions(+), 38 deletions(-) ----------------------------------------------------------------------
