Merge branch 'master' of https://github.com/MaxWhere/electron into MaxWhere-master
authorCheng Zhao <zcbenz@gmail.com>
Fri, 18 Sep 2015 04:01:33 +0000 (12:01 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Fri, 18 Sep 2015 04:01:33 +0000 (12:01 +0800)
commitee0d48dc5a3beb21bddfc830b78f700f0a63595a
tree5d2915d087d04f195cdfd182be5eb4295a8f446a
parent15394b9a3b25609b18e55ca06281d2291c804fb2
parent90064eeddda903f6fd554e2c484e1ec5a86a1e8a
Merge branch 'master' of https://github.com/MaxWhere/electron into MaxWhere-master
atom/browser/api/atom_api_window.cc
atom/browser/api/atom_api_window.h
atom/browser/native_window.cc
atom/browser/native_window.h
atom/common/options_switches.cc
atom/common/options_switches.h
docs/api/browser-window.md
filenames.gypi