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

Conflicts:
	atom.gyp
	vendor/apm
	vendor/brightray

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

..

api

win: Use util.format to format arguments in console.log.

2014-02-12 20:32:30 +08:00

crash_reporter

Add dummy implementation of crash reporter.

2014-01-15 12:01:03 +00:00

lib

Fix uv loop hack on child_process.

2014-01-18 17:01:30 +08:00

linux

linux: Implement brightray's stub functions.

2013-12-31 12:24:53 +00:00

resources/mac

Move resources file under resources/

2014-01-31 19:34:31 +08:00

v8

Update node to v0.11.10.

2014-01-10 18:24:44 +08:00

atom_version.h

Bump v0.9.2.

2014-02-12 20:52:46 +08:00

draggable_region.cc

Add IPC messages and structs for passing draggable regions.

2013-09-05 19:46:12 +08:00

draggable_region.h

Add IPC messages and structs for passing draggable regions.

2013-09-05 19:46:12 +08:00

node_bindings_mac.cc

Activate uv loop when uv loop's watcher queue changes, fixes #159.

2014-01-18 16:56:46 +08:00

node_bindings_mac.h

Activate uv loop when uv loop's watcher queue changes, fixes #159.

2014-01-18 16:56:46 +08:00

node_bindings_win.cc

Make all the windows code compile for Chrome 31.

2013-12-17 17:52:57 +08:00

node_bindings_win.h

Don't separate node bindings into renderer and browser part.

2013-07-22 16:05:35 +08:00

node_bindings.cc

Wrap callbacks with v8::Locker.

2014-01-27 15:14:11 +08:00

node_bindings.h

💄 get_uv_env() => uv_env().

2014-01-10 16:29:38 +08:00

options_switches.cc

Rename iframe-security to node-integration.

2014-01-30 23:20:12 +08:00

options_switches.h

Rename iframe-security to node-integration.

2014-01-30 23:20:12 +08:00

platform_util_linux.cc

linux: Implement platform_util.

2013-12-31 12:59:33 +00:00

platform_util_mac.mm

Huge commit to use new V8 and Content APIs.

2013-12-11 15:48:19 +08:00

platform_util_win.cc

Make all the windows code compile for Chrome 31.

2013-12-17 17:52:57 +08:00

platform_util.h

Closing a window requires closing web contents now.

2013-05-01 15:42:30 +08:00

swap_or_assign.h

Fix template related compilation errors of VC++.

2013-12-09 16:34:10 +08:00