You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pi...@apache.org on 2017/06/26 20:53:12 UTC
[09/10] git commit: [flex-asjs]
[refs/heads/feature/FLEX-35328_simplify_mdl_drop_down_list] - Merge branch
'develop' into feature/FLEX-35328_simplify_mdl_drop_down_list
Merge branch 'develop' into feature/FLEX-35328_simplify_mdl_drop_down_list
# Conflicts:
# distribution/pom.xml
# distribution/src/main/assembly/component.xml
# examples/express/DataBindingExample/pom.xml
# examples/flexjs/TeamPage/pom.xml
# frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/181082a8
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/181082a8
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/181082a8
Branch: refs/heads/feature/FLEX-35328_simplify_mdl_drop_down_list
Commit: 181082a8ab7951fd8a0e1cab05da4c0c0bc49c01
Parents: c706278 9929255
Author: piotrz <pi...@apache.org>
Authored: Mon Jun 26 21:50:08 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Mon Jun 26 21:50:08 2017 +0200
----------------------------------------------------------------------
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
build.properties | 2 +-
examples/express/DataBindingExample/pom.xml | 2 +-
examples/flexjs/FlexTeamPage_MDL/pom.xml | 2 +-
examples/flexjs/MDLBlogExample/pom.xml | 2 +-
examples/flexjs/MDLDynamicTabsExample/pom.xml | 2 +-
examples/flexjs/MDLExample/pom.xml | 2 +-
examples/flexjs/TeamPage/pom.xml | 10 +---------
.../flex/org/apache/flex/core/SimpleCSSValuesImpl.as | 12 ++++++------
pom.xml | 2 +-
releasecandidate.xml | 7 ++++---
13 files changed, 21 insertions(+), 28 deletions(-)
----------------------------------------------------------------------