flex-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Josh Tynjala <joshtynj...@gmail.com>
Subject Re: [7/7] git commit: [flex-asjs] [refs/heads/release0.8.0] - Merge branch 'develop' into release0.8.0
Date Wed, 17 May 2017 01:23:56 GMT
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, <piotrz@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 <piotrz@apache.org>
> Authored: Wed May 17 03:11:25 2017 +0200
> Committer: piotrz <piotrz@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(-)
> ----------------------------------------------------------------------
>
>
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message