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/develop Commit: 181082a8ab7951fd8a0e1cab05da4c0c0bc49c01 Parents: c706278 9929255 Author: piotrz <pio...@apache.org> Authored: Mon Jun 26 21:50:08 2017 +0200 Committer: piotrz <pio...@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(-) ----------------------------------------------------------------------