You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2018/11/19 07:47:05 UTC

[royale-asjs] 01/01: Merge branch 'release/0.9.4' into develop

This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git

commit 2c312472a46214029b9847a1a25237c5ca15de02
Merge: fd10562 b70b357
Author: Alex Harui <ah...@apache.org>
AuthorDate: Sun Nov 18 23:43:08 2018 -0800

    Merge branch 'release/0.9.4' into develop

 ApproveRoyale.xml                                  |  50 ++--
 LICENSE                                            |  22 +-
 NOTICE                                             |  13 +
 RELEASE_NOTES.md                                   |   9 +
 build.properties                                   |   2 +-
 .../CordovaCameraExample-app.xml                   |   2 +-
 examples/royale/DesktopMap/DesktopMap-app.xml      |   2 +-
 examples/royale/MapSearch/MapSearch-app.xml        |   2 +-
 examples/royale/MobileMap/MobileMap-app.xml        |   2 +-
 examples/royale/MobileStocks/MobileStocks-app.xml  |   2 +-
 examples/royale/RoyaleWebsite/build.xml            |   4 +-
 .../royale/StorageExample/StorageExample-app.xml   |   2 +-
 .../themes/JewelThemeJS}/build.xml                 | 261 ++++++++++----------
 frameworks/themes/JewelTheme/build.xml             | 267 +++++++++++----------
 npm/js-only/package.json                           |   2 +-
 npm/js-swf/package.json                            |   2 +-
 package.json                                       |   2 +-
 releasemgr/NOTICE                                  |  12 +
 releasemgr/RELEASE_NOTES                           |   8 +
 royale-asjs.code-workspace                         |  19 --
 20 files changed, 369 insertions(+), 316 deletions(-)