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/fa005409
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fa005409
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fa005409

Branch: refs/heads/feature/fontawesome
Commit: fa0054093a6ab94af8deba6a0a1beefd4936cfdd
Parents: 4818e6d ae56b06
Author: piotrz <[email protected]>
Authored: Fri Jan 6 19:38:03 2017 +0100
Committer: piotrz <[email protected]>
Committed: Fri Jan 6 19:38:03 2017 +0100

----------------------------------------------------------------------
 .../src/main/flex/MyInitialView.mxml            |  2 -
 .../flexjs/MDLExample/src/main/flex/Tabs.mxml   | 10 +----
 .../flex/html/beads/layouts/DataGridLayout.as   | 18 ++++++---
 .../src/main/flex/org/apache/flex/mdl/TabBar.as |  3 +-
 .../src/main/flex/org/apache/flex/mdl/Tabs.as   |  9 +++++
 .../org/apache/flex/mdl/beads/views/TabsView.as | 40 ++++++++++++++++++++
 6 files changed, 65 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


Reply via email to