Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs 
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/815228c4
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/815228c4
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/815228c4

Branch: refs/heads/develop
Commit: 815228c4bbe914bece05e6fa7fab5f5dc8362d22
Parents: ca55263 8d88042
Author: yishayw <yishayj...@hotmail.com>
Authored: Thu Jan 26 15:11:22 2017 +0200
Committer: yishayw <yishayj...@hotmail.com>
Committed: Thu Jan 26 15:11:22 2017 +0200

----------------------------------------------------------------------
 distribution/src/main/assembly/component.xml    |   1 +
 .../main/resources/flexjs-sdk-description.xml   |  32 ++++++
 .../flex/itemRenderers/MemberItemRenderer.mxml  |   6 +-
 .../MDLExample/src/main/flex/Toggles.mxml       |  19 +++-
 .../flex/html/beads/layouts/HorizontalLayout.as |   5 +-
 .../main/flex/org/apache/flex/mdl/IconToggle.as |  91 ++++++++++++++-
 .../flex/mdl/materialIcons/MaterialIconType.as  | 111 ++++++++++---------
 .../src/main/resources/defaults.css             |   5 +
 8 files changed, 205 insertions(+), 65 deletions(-)
----------------------------------------------------------------------


Reply via email to