Merge branch 'master' of https://github.com/preco21/electron into preco21-master
authorCheng Zhao <zcbenz@gmail.com>
Fri, 21 Aug 2015 03:30:47 +0000 (11:30 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Fri, 21 Aug 2015 03:30:47 +0000 (11:30 +0800)
commit01921ee6fa98f18dafe9e29de27aac0d8edcfef7
treee7de779c3d1987f5497fd7d7f74f9f8221fbf62a
parent8cc602ff946682f11e34dd2820e5c9bbe55a5be6
parentad24c11f3214ebc79b66eab08e2d09dd6d3c5fdf
Merge branch 'master' of https://github.com/preco21/electron into preco21-master

Conflicts:
docs/api/browser-window-ko.md