Merge branch 'master' of https://github.com/electron/electron
authorCheng Zhao <zcbenz@gmail.com>
Wed, 11 May 2016 06:15:15 +0000 (15:15 +0900)
committerCheng Zhao <zcbenz@gmail.com>
Wed, 11 May 2016 06:15:15 +0000 (15:15 +0900)
commit2cd41b2f845301a5ed9b3e6e1a8105639e896e30
tree9a61f28ae5ccd3efc6d55a0f2ba72db7a0cc7540
parent0f52a6da39c0752637a8e170d27f3bfd6825eb2f
parent71704fc5d8b2c1abb0300f8dd3d14c5324a896f6
Merge branch 'master' of https://github.com/electron/electron
lib/browser/api/app.js