Cheng Zhao 2f798c5116 Merge branch 'master' into linux ... Conflicts: vendor/apm		2014-01-15 11:18:40 +00:00
..
win	Bump v0.8.5.	2014-01-14 16:24:53 +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	Fix entry function under Linux.	2013-12-31 11:51:17 +00: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	Print pid when logging.	2013-12-23 22:04:49 +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