github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into tj-upgrade-electron

Browse Source 
# Conflicts:
#	script/package.json
#	src/task.coffee
This commit is contained in:
Antonio Scandurra
2017-05-11 18:05:12 +02:00
parent 1b27df639d e9a124f0fb
commit 729ae0ea51
17 changed files with 126 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/task-bootstrap.js
View File

@@ -1,9 +1,5 @@
/* global snapshotResult */
if (typeof snapshotResult !== 'undefined') {
snapshotResult.setGlobals(global, process, global, {}, console, require)
}
const {userAgent} = process.env
const [compileCachePath, taskPath] = process.argv.slice(2)