Cheng Zhao 4051d2ebdb Merge branch 'master' into linux ...

Conflicts:
	atom.gyp
	vendor/apm
	vendor/brightray

2014-02-14 13:17:00 +00:00

..

app.md

Rename 'finish-launching' event to 'ready',

2013-12-27 11:08:26 +08:00

auto-updater.md

📝 Add docs on new auto updater API.

2014-02-02 20:55:35 +08:00

browser-window.md

Merge branch 'master' into linux

2014-02-14 13:17:00 +00:00

dialog.md

doc: Separate pages into sub directories.

2013-09-09 15:49:13 +08:00

frameless-window.md

doc: Metion the frameless-window-demo.

2013-09-09 20:17:47 +08:00

ipc-browser.md

Prefer event.returnValue to event.result for sync messages.

2013-09-20 21:37:00 +08:00

menu-item.md

Add "CommandOrControl" to represent "Command" on OS X and "Ctrl" on other platforms.

2013-11-29 16:11:48 +08:00

menu.md

Fix a couple minor typos in docs

2013-12-12 22:31:19 -08:00

power-monitor.md

doc: Separate pages into sub directories.

2013-09-09 15:49:13 +08:00

protocol.md

doc: Mention when protocol module is safe to use.

2013-09-20 18:36:16 +08:00