Cheng Zhao 4051d2ebdb Merge branch 'master' into linux ... Conflicts: atom.gyp vendor/apm vendor/brightray		2014-02-14 13:17:00 +00:00
..
browser	Merge branch 'master' into linux	2014-02-14 13:17:00 +00:00
common	📝 Add docs on screen module.	2014-01-07 20:35:13 +08:00
renderer	Add notes on remote buffer.	2013-12-30 23:15:15 +08:00