You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ha...@apache.org on 2018/10/29 11:45:22 UTC

[royale-typedefs] branch develop updated (0bf671e -> ecf38ed)

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

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


    from 0bf671e  make sure certain consts are true constants.  Volunteers welcome to add more config entries for other constants
     add 4c32e8f  [maven-release-plugin] prepare branch release/0.9.4
     add 6984a65  [maven-release-plugin] prepare for next development iteration
     add 69ded5d  update version to 0.9.4
     new ecf38ed  Merge branch 'develop' of https://github.com/apache/royale-typedefs 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:


[royale-typedefs] 01/01: Merge branch 'develop' of https://github.com/apache/royale-typedefs into develop

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

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

commit ecf38ed91dadd00536574835c5b7339005d4b002
Merge: 69ded5d 0bf671e
Author: Harbs <ha...@in-tools.com>
AuthorDate: Mon Oct 29 13:45:09 2018 +0200

    Merge branch 'develop' of https://github.com/apache/royale-typedefs into develop
    
    # Conflicts:
    #	GCL/pom.xml
    #	cordova/pom.xml
    #	createjs/pom.xml
    #	google_maps/pom.xml
    #	jasmine/pom.xml
    #	jquery/pom.xml
    #	js/pom.xml
    #	node/pom.xml
    #	pom.xml

 GCL/pom.xml                           |  6 +++---
 cordova/pom.xml                       |  6 +++---
 createjs/pom.xml                      |  6 +++---
 google_maps/pom.xml                   |  6 +++---
 jasmine/pom.xml                       |  6 +++---
 jquery/pom.xml                        |  6 +++---
 js/pom.xml                            |  4 ++--
 js/src/main/config/externc-config.xml | 29 +++++++++++++++++++++++++++++
 js/src/main/javascript/missing.js     | 13 ++++---------
 node/pom.xml                          |  6 +++---
 pom.xml                               |  4 ++--
 11 files changed, 58 insertions(+), 34 deletions(-)