Cheng Zhao a4715f936b Merge branch 'master' into chrome31 ... Conflicts: common/atom_version.h		2013-12-17 12:58:25 +08:00
..
win	Bump v0.7.6.	2013-12-08 22:42:43 -08:00
atom_library_main.cc	Implement main function on Windows.	2013-07-01 22:21:31 +08:00
atom_library_main.h	Implement main function on Windows.	2013-07-01 22:21:31 +08:00
atom_main.cc	win: Start as crash service when ATOM_SHELL_INTERNAL_CRASH_SERVICE is set.	2013-11-24 17:35:58 +08:00
atom_main.h	Add a corresponding .h file for atom_main.cc.	2013-11-05 13:12:13 +08:00
atom_main_delegate.cc	Use node's Environment feature to add "require" in renderer.	2013-12-15 14:20:28 +08:00
atom_main_delegate.h	Huge commit to use new V8 and Content APIs.	2013-12-11 15:48:19 +08:00
atom_main_delegate_mac.mm	Huge commit to use new V8 and Content APIs.	2013-12-11 15:48:19 +08:00