Cheng Zhao 67d9ae27c3 Remove the JavaScript wrapper for setContextMenu		2016-05-20 16:18:38 +09:00
..
browser	Remove the JavaScript wrapper for setContextMenu	2016-05-20 16:18:38 +09:00
common	Merge pull request #5617 from electron/dont-return-from-on-functions	2016-05-20 00:26:29 +00:00
renderer	Merge pull request #5616 from electron/inherit-zoom	2016-05-20 00:27:06 +00:00