Merge branch 'develop' into tlf # Conflicts: # distribution/pom.xml # distribution/src/main/assembly/component.xml # examples/express/DataBindingExample/pom.xml # examples/express/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/c2f7a2d8 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c2f7a2d8 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c2f7a2d8 Branch: refs/heads/develop Commit: c2f7a2d8f3b83a95090da88b207e767731f5f0a8 Parents: e9e039d 911cf92 Author: Harbs <ha...@in-tools.com> Authored: Tue Jun 27 20:13:04 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Tue Jun 27 20:13:04 2017 +0300 ---------------------------------------------------------------------- .../main/resources/archetype-resources/pom.xml | 2 +- .../main/resources/archetype-resources/pom.xml | 2 +- .../main/resources/archetype-resources/pom.xml | 2 +- build.properties | 2 +- distribution/pom.xml | 13 ++-- distribution/src/main/assembly/component.xml | 4 +- examples/express/DataBindingExample/pom.xml | 2 +- examples/express/pom.xml | 4 +- 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 +- .../flexjs/MDLExample/src/main/flex/Tables.mxml | 51 ++++++++++--- .../CustomTableRowItemRenderer.mxml | 15 +++- .../TableRowItemRendererWithIcons.mxml | 13 +++- examples/flexjs/TeamPage/pom.xml | 7 +- .../main/flex/org/apache/flex/mdl/TableCell.as | 27 +------ .../flex/org/apache/flex/mdl/TableColumn.as | 29 +------- .../apache/flex/mdl/beads/TableNumericEnable.as | 77 ++++++++++++++++++++ .../mdl/itemRenderers/TableRowItemRenderer.as | 27 +------ .../src/main/resources/mdl-manifest.xml | 2 + nightly.properties | 2 +- pom.xml | 2 +- releasecandidate.xml | 7 +- 24 files changed, 172 insertions(+), 126 deletions(-) ----------------------------------------------------------------------