royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ha...@apache.org
Subject [royale-typedefs] 01/01: Merge branch 'develop' of https://github.com/apache/royale-typedefs into develop
Date Mon, 29 Oct 2018 11:45:23 GMT
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 <harbs@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(-)


Mime
View raw message