Merge branch 'develop' into e4x * develop: Core: Language now checks for global console variable as final fallback, which adds trace() support for Node.js release builds trace(): better detection of window.console() so that there isn't a runtime error in a Node.js release build intellij-config.xml: updated paths to manifests to match frameworks/projects/flex-config.xml
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/3872cb8e Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/3872cb8e Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/3872cb8e Branch: refs/heads/develop Commit: 3872cb8e1cb41316fa553d07ca3f1232e7a4f838 Parents: c7fd667 59b8e43 Author: Harbs <[email protected]> Authored: Tue Feb 16 13:27:40 2016 +0200 Committer: Harbs <[email protected]> Committed: Tue Feb 16 13:27:40 2016 +0200 ---------------------------------------------------------------------- .../Core/src/main/flex/org/apache/flex/utils/Language.as | 9 ++++++--- ide/IDEA/intellij-config.xml | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
