You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by pi...@apache.org on 2019/10/06 08:41:51 UTC
[royale-compiler] 02/02: Merge branch 'release/0.9.6' into develop
This is an automated email from the ASF dual-hosted git repository.
piotrz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit 51b3f5d3e9c2aa7f99ba555bf25672cb883a0b69
Merge: f3068e9 7763f6d
Author: Piotr Zarzycki <pi...@gmail.com>
AuthorDate: Sun Oct 6 10:41:40 2019 +0200
Merge branch 'release/0.9.6' into develop
# Conflicts:
# compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/MemberAccessEmitter.java
NOTICE | 2 +-
NOTICE.base | 2 +-
NOTICE.fdb | 2 +-
NOTICE.oem | 2 +-
build.properties | 4 +-
build.xml | 14 +
compiler-build-tools/pom.xml | 2 +-
compiler-common/pom.xml | 4 +-
compiler-externc/pom.xml | 8 +-
compiler-jburg-types/pom.xml | 2 +-
compiler-jx/pom.xml | 14 +-
.../codegen/mxml/royale/MXMLRoyalePublisher.java | 4 +-
compiler-test-utils/pom.xml | 4 +-
compiler/pom.xml | 1159 +++++++++---------
.../compiler/internal/projects/RoyaleProject.java | 55 +-
debugger/pom.xml | 8 +-
flex-compiler-oem/pom.xml | 10 +-
pom.xml | 1274 ++++++++++----------
royale-ant-tasks/pom.xml | 4 +-
royale-maven-plugin/pom.xml | 4 +-
royaleunit-ant-tasks/pom.xml | 134 +-
swfutils/pom.xml | 4 +-
22 files changed, 1380 insertions(+), 1336 deletions(-)