Merge pull request #3384 from atom/ipc-renderer
authorCheng Zhao <zcbenz@gmail.com>
Tue, 10 Nov 2015 09:29:07 +0000 (17:29 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Tue, 10 Nov 2015 09:29:07 +0000 (17:29 +0800)
commit0af1308ad712b2f009b6964624742a0f41e5120f
tree9db7049c0e8a867d9db81ee6662befd97dfdda83
parent5d1f7ed029d638319a6c3d31c7a916107dcfab3e
parentd234f10177c71cdf6860e90e3317f3b5d17eb13e
Merge pull request #3384 from atom/ipc-renderer

Use different names for "ipc" module in main and renderer processes