mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge branch 'master' into chrome44

Browse source
This commit is contained in:
Cheng Zhao 2015-08-21 19:29:34 +08:00
commit 9212a1db8e
47 changed files with 885 additions and 2234 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/lib/init.coffee
View file

@ -38,7 +38,7 @@ process.on 'uncaughtException', (error) ->
# Show error in GUI.
stack = error.stack ? "#{error.name}: #{error.message}"
message = "Uncaught Exception:\n#{stack}"
require('dialog').showErrorBox 'A JavaScript error occured in the main process', message
require('dialog').showErrorBox 'A JavaScript error occurred in the main process', message
# Emit 'exit' event on quit.
app = require 'app'