You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2018/12/06 18:35:49 UTC

[royale-asjs] branch develop updated (8e49878 -> 23697d9)

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

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


    from 8e49878  Fix launch.json
     add fdee91b  Revert "this fixes when using Royale + MXRoyale in the same project, revert this when figure how to solve it"
     add e18719b  fix a project config that uses Jewel and MXRoyale
     new 23697d9  Merge branch 'feature/config-name-changes' into develop

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../mxroyale/RemoteObjectAMFTest/asconfig.json     |  8 ++-
 frameworks/royale-config-template.xml              | 71 +++++++++++++++++++---
 2 files changed, 68 insertions(+), 11 deletions(-)


[royale-asjs] 01/01: Merge branch 'feature/config-name-changes' into develop

Posted by ca...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 23697d9e064f021e4ecfd0aa04af90feaefbef71
Merge: 8e49878 e18719b
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Thu Dec 6 19:35:22 2018 +0100

    Merge branch 'feature/config-name-changes' into develop
    
    * feature/config-name-changes:
      fix a project config that uses Jewel and MXRoyale
      Revert "this fixes when using Royale + MXRoyale in the same project, revert this when figure how to solve it"

 .../mxroyale/RemoteObjectAMFTest/asconfig.json     |  8 ++-
 frameworks/royale-config-template.xml              | 71 +++++++++++++++++++---
 2 files changed, 68 insertions(+), 11 deletions(-)