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

Conflicts:
	atom.gyp
	vendor/apm
	vendor/brightray

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

..

apm @ af40a0ed55

Merge branch 'master' into linux

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

breakpad @ 2483f32da1

Add script to generate symbols from pdbs on Windows.

2013-11-26 21:23:50 +08:00

brightray @ 569ea3f1e1

Fix assertions when building against Debug libchromiumcontent.

2014-02-05 11:18:32 +08:00

depot_tools @ a738935a12

Update to latest gyp and depot_tools.

2013-11-12 18:34:01 +08:00

node @ 80c5e17c09

Crash when there is fatal error in V8.

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