Merge branch 'master' into chrome51
authorCheng Zhao <zcbenz@gmail.com>
Mon, 23 May 2016 10:49:43 +0000 (19:49 +0900)
committerCheng Zhao <zcbenz@gmail.com>
Mon, 23 May 2016 10:49:43 +0000 (19:49 +0900)
commit9f858e1243e329dcfcc337646aba46a07a54943f
treefec38ddb8983679864c4f1c6822d517d5ee15682
parent208acd1b9c59b33d9c14f8c1b00b4e7ace15229d
parentc489d6d4b3b6a6ecbc1c555e484126dd1480f954
Merge branch 'master' into chrome51
atom/browser/api/atom_api_app.cc
atom/browser/api/atom_api_app.h
atom/browser/api/atom_api_session.cc
atom/browser/atom_browser_context.cc
atom/browser/atom_browser_context.h
atom/browser/native_window.h
atom/browser/native_window_mac.mm