This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch feature/wast in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 0eab7891e5d10f8c8a9992961bdcf6ed683b5fad Merge: cc27858 cc46631 Author: Erik de Bruin <[email protected]> AuthorDate: Wed Nov 15 18:27:38 2017 +0100 Merge branch 'develop' into wast Signed-off-by: Erik de Bruin <[email protected]> # Conflicts: # wast/resources/glue.js .gitignore | 3 --- InstallAdobeSDKs.xml | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
