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/05/17 01:17:40 UTC
[7/7] git commit: [flex-asjs] [refs/heads/release0.8.0] - Merge
branch 'develop' into release0.8.0
Merge branch 'develop' into release0.8.0
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/cd99bb66
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/cd99bb66
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/cd99bb66
Branch: refs/heads/release0.8.0
Commit: cd99bb665b1cc62b0bb2118c37a5b5b5c3cbb297
Parents: 4b0197b 8326592
Author: piotrz <pi...@apache.org>
Authored: Wed May 17 03:11:25 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Wed May 17 03:11:25 2017 +0200
----------------------------------------------------------------------
.../main/resources/archetype-resources/pom.xml | 15 +--------
.../main/resources/archetype-resources/pom.xml | 2 +-
.../main/resources/archetype-resources/pom.xml | 1 +
.../MDLExample/src/main/flex/Snackbar.mxml | 1 -
.../MDLExample/src/main/flex/Toggles.mxml | 2 +-
.../ActorNameAndIconListItemRenderer.mxml | 3 +-
.../AvatarAndActionListItemRenderer.mxml | 3 +-
...vatarAndActionThreeLineListItemRenderer.mxml | 3 +-
.../itemRenderers/CustomMenuItemRenderer.mxml | 19 +++++++-----
.../CustomTabBarPanelItemRenderer.mxml | 20 +++++++-----
.../TableRowItemRendererWithIcons.mxml | 3 +-
.../src/main/flex/models/MainNavigationModel.as | 3 +-
.../src/main/flex/models/TabsModel.as | 3 +-
.../projects/Binding/.actionScriptProperties | 3 +-
.../projects/Charts/.actionScriptProperties | 2 +-
.../Collections/.actionScriptProperties | 3 +-
.../projects/Core/.actionScriptProperties | 2 +-
.../projects/CreateJS/.actionScriptProperties | 2 +-
.../projects/DragDrop/.actionScriptProperties | 2 +-
.../projects/Effects/.actionScriptProperties | 2 +-
.../projects/Flat/.actionScriptProperties | 2 +-
.../projects/Formatters/.actionScriptProperties | 2 +-
.../projects/GoogleMaps/.actionScriptProperties | 2 +-
.../projects/Graphics/.actionScriptProperties | 32 +++++++++++---------
.../projects/HTML/.actionScriptProperties | 29 +++++++++---------
.../projects/HTML5/.actionScriptProperties | 26 ++++++++--------
.../projects/JQuery/.actionScriptProperties | 26 ++++++++--------
.../projects/Mobile/.actionScriptProperties | 26 ++++++++--------
.../projects/Network/.actionScriptProperties | 26 ++++++++--------
.../projects/Reflection/.actionScriptProperties | 26 ++++++++--------
frameworks/projects/Text/build.xml | 2 +-
31 files changed, 149 insertions(+), 144 deletions(-)
----------------------------------------------------------------------
Re: [7/7] git commit: [flex-asjs] [refs/heads/release0.8.0] - Merge
branch 'develop' into release0.8.0
Posted by piotrz <pi...@gmail.com>.
Hi Josh,
Sorry about that - Thanks for pointing me that. I would be more careful next
time. If anyone will have to problems with that let's report immediately I
will revert it!!
Piotr
-----
Apache Flex PMC
piotrzarzycki21@gmail.com
--
View this message in context: http://apache-flex-development.2333347.n4.nabble.com/Re-7-7-git-commit-flex-asjs-refs-heads-release0-8-0-Merge-branch-develop-into-release0-8-0-tp61665p61666.html
Sent from the Apache Flex Development mailing list archive at Nabble.com.
Re: [7/7] git commit: [flex-asjs] [refs/heads/release0.8.0] - Merge
branch 'develop' into release0.8.0
Posted by Josh Tynjala <jo...@gmail.com>.
It might be good to check if everyone is okay merging things from develop
into the release branch before you do it. Once there's a release branch,
someone might decide to start working on new features for the next version
in develop. I'm not saying that anyone has necessarily done that, but best
to be safe!
- Josh
On May 16, 2017 9:17 PM, <pi...@apache.org> wrote:
> Merge branch 'develop' into release0.8.0
>
>
> Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
> Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/cd99bb66
> Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/cd99bb66
> Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/cd99bb66
>
> Branch: refs/heads/release0.8.0
> Commit: cd99bb665b1cc62b0bb2118c37a5b5b5c3cbb297
> Parents: 4b0197b 8326592
> Author: piotrz <pi...@apache.org>
> Authored: Wed May 17 03:11:25 2017 +0200
> Committer: piotrz <pi...@apache.org>
> Committed: Wed May 17 03:11:25 2017 +0200
>
> ----------------------------------------------------------------------
> .../main/resources/archetype-resources/pom.xml | 15 +--------
> .../main/resources/archetype-resources/pom.xml | 2 +-
> .../main/resources/archetype-resources/pom.xml | 1 +
> .../MDLExample/src/main/flex/Snackbar.mxml | 1 -
> .../MDLExample/src/main/flex/Toggles.mxml | 2 +-
> .../ActorNameAndIconListItemRenderer.mxml | 3 +-
> .../AvatarAndActionListItemRenderer.mxml | 3 +-
> ...vatarAndActionThreeLineListItemRenderer.mxml | 3 +-
> .../itemRenderers/CustomMenuItemRenderer.mxml | 19 +++++++-----
> .../CustomTabBarPanelItemRenderer.mxml | 20 +++++++-----
> .../TableRowItemRendererWithIcons.mxml | 3 +-
> .../src/main/flex/models/MainNavigationModel.as | 3 +-
> .../src/main/flex/models/TabsModel.as | 3 +-
> .../projects/Binding/.actionScriptProperties | 3 +-
> .../projects/Charts/.actionScriptProperties | 2 +-
> .../Collections/.actionScriptProperties | 3 +-
> .../projects/Core/.actionScriptProperties | 2 +-
> .../projects/CreateJS/.actionScriptProperties | 2 +-
> .../projects/DragDrop/.actionScriptProperties | 2 +-
> .../projects/Effects/.actionScriptProperties | 2 +-
> .../projects/Flat/.actionScriptProperties | 2 +-
> .../projects/Formatters/.actionScriptProperties | 2 +-
> .../projects/GoogleMaps/.actionScriptProperties | 2 +-
> .../projects/Graphics/.actionScriptProperties | 32 +++++++++++---------
> .../projects/HTML/.actionScriptProperties | 29 +++++++++---------
> .../projects/HTML5/.actionScriptProperties | 26 ++++++++--------
> .../projects/JQuery/.actionScriptProperties | 26 ++++++++--------
> .../projects/Mobile/.actionScriptProperties | 26 ++++++++--------
> .../projects/Network/.actionScriptProperties | 26 ++++++++--------
> .../projects/Reflection/.actionScriptProperties | 26 ++++++++--------
> frameworks/projects/Text/build.xml | 2 +-
> 31 files changed, 149 insertions(+), 144 deletions(-)
> ----------------------------------------------------------------------
>
>
>