Merge branch 'master' into ku-crash-recovery

This commit is contained in:
Katrina Uychaco
2016-02-10 11:10:57 -08:00
19 changed files with 291 additions and 59 deletions

View File

@@ -49,6 +49,7 @@ class AtomWindow
loadSettings.devMode ?= false
loadSettings.safeMode ?= false
loadSettings.atomHome = process.env.ATOM_HOME
loadSettings.firstLoad = true
# Only send to the first non-spec window created
if @constructor.includeShellLoadTime and not @isSpec