Merge branch 'master' into chrome52
authorCheng Zhao <zcbenz@gmail.com>
Thu, 21 Jul 2016 11:34:36 +0000 (05:34 -0600)
committerCheng Zhao <zcbenz@gmail.com>
Thu, 21 Jul 2016 11:34:36 +0000 (05:34 -0600)
commitb57665330cc59e75e2ac78c954179c80936500ad
treef1febbd621e185f81f9ad48e48b086f812e20556
parent437164deecbfa5c957d737db50a79119d93a6f22
parent9cdc74e431190037a6220cba100819030b199125
Merge branch 'master' into chrome52
24 files changed:
atom/app/node_main.cc
atom/browser/api/atom_api_menu.h
atom/browser/api/atom_api_menu_views.cc
atom/browser/api/atom_api_protocol.cc
atom/browser/api/atom_api_session.cc
atom/browser/api/atom_api_tray.h
atom/browser/atom_browser_context.cc
atom/browser/atom_browser_main_parts.cc
atom/browser/browser_win.cc
atom/browser/native_window.cc
atom/browser/native_window.h
atom/browser/native_window_views.cc
atom/browser/net/asar/url_request_asar_job.cc
atom/browser/ui/tray_icon_cocoa.mm
atom/browser/ui/views/menu_delegate.h
atom/browser/ui/win/notify_icon.cc
atom/browser/ui/win/notify_icon.h
atom/common/api/atom_api_native_image.cc
atom/common/native_mate_converters/v8_value_converter.cc
atom/renderer/atom_renderer_client.cc
atom/renderer/atom_renderer_client.h
common.gypi
docs/api/browser-window.md
vendor/brightray