simurai a4435305f1 Merge branch 'master' into pb-hidden-inset ...

# Conflicts:
#	src/main-process/atom-window.coffee

2016-09-21 14:48:22 +09:00

..

application-menu.coffee

browser -> main-process

2016-05-25 11:02:29 +02:00

atom-application.coffee

🎨

2016-09-20 15:15:55 -06:00

atom-portable.js

Copy comments

2016-07-27 15:09:08 +02:00

atom-protocol-handler.coffee

browser -> main-process

2016-05-25 11:02:29 +02:00

atom-window.coffee

Merge branch 'master' into pb-hidden-inset

2016-09-21 14:48:22 +09:00

auto-update-manager.coffee

Fix DownloadingState typo

2016-06-07 22:06:08 -07:00

auto-updater-win32.coffee

Merge branch 'master' into as-main-process-test-runner

2016-05-25 11:03:10 +02:00

context-menu.coffee

browser -> main-process

2016-05-25 11:02:29 +02:00

file-recovery-service.js

Use fs.copyFileSync for buffered copy

2016-05-26 19:06:15 +02:00

main.js

Remove app load time console output

2016-09-09 13:08:00 -07:00

parse-command-line.js

Fix calling atom --version

2016-08-12 09:33:15 +02:00

spawner.coffee

browser -> main-process

2016-05-25 11:02:29 +02:00

squirrel-update.coffee

Windows shell upgrade fixes #12642

2016-09-08 15:58:27 -07:00

win-powershell.coffee

browser -> main-process

2016-05-25 11:02:29 +02:00

win-shell.coffee

Windows shell upgrade fixes #12642

2016-09-08 15:58:27 -07:00