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:23 UTC
[royale-typedefs] 01/01: Merge branch 'develop' of
https://github.com/apache/royale-typedefs into develop
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(-)