Cheng Zhao 8aee0f52e9 Merge pull request #3715 from atom/do-not-edit-menu-template ... Do not modify the specified menu template		2015-12-09 12:13:07 +08:00
..
app	Update to API changes of Chrome 47	2015-12-07 19:56:23 +08:00
browser	Merge pull request #3715 from atom/do-not-edit-menu-template	2015-12-09 12:13:07 +08:00
common	Merge branch 'master' into desktop-capture-api	2015-12-08 12:43:44 +08:00
renderer	Simplify the desktopCapturer code	2015-12-08 13:49:26 +08:00
utility