Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c6ca72a2 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c6ca72a2 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c6ca72a2 Branch: refs/heads/develop Commit: c6ca72a2fa2e6f5079d9701ac0e2f432e498165e Parents: b5cfb64 dd51e84 Author: Christofer Dutz <christofer.d...@codecentric.de> Authored: Fri Jan 13 14:26:44 2017 +0100 Committer: Christofer Dutz <christofer.d...@codecentric.de> Committed: Fri Jan 13 14:26:44 2017 +0100 ---------------------------------------------------------------------- .../MDLExample/src/main/flex/Buttons.mxml | 48 +++++++++++++++--- .../MDLExample/src/main/flex/Footers.mxml | 53 ++++++++++++++++++++ .../src/main/flex/MainNavigation.mxml | 3 +- .../flexjs/MDLExample/src/main/flex/Tabs.mxml | 4 +- .../MDLExample/src/main/flex/Toggles.mxml | 13 ++++- .../src/main/flex/models/MainNavigationModel.as | 3 +- frameworks/flex-config-template.xml | 18 +++++++ frameworks/flex-config.xml | 18 +++++++ .../main/flex/org/apache/flex/html/DataGrid.as | 30 +++++++---- .../accessories/NumericOnlyTextInputBead.as | 4 +- .../org/apache/flex/html/beads/DataGridView.as | 20 ++++---- .../flex/mdl/materialIcons/MaterialIconMood.as | 52 +++++++++++++++++++ .../flex/mdl/materialIcons/MaterialIconsType.as | 1 + .../src/main/resources/mdl-manifest.xml | 1 + 14 files changed, 235 insertions(+), 33 deletions(-) ----------------------------------------------------------------------
