Merge tag 'v0.33.6'
authorCheng Zhao <zcbenz@gmail.com>
Mon, 5 Oct 2015 11:58:47 +0000 (19:58 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Mon, 5 Oct 2015 11:58:47 +0000 (19:58 +0800)
1  2 
atom/browser/native_window_views.cc

Simple merge