Merge pull request #777 from atom/web-dialog
authorCheng Zhao <zcbenz@gmail.com>
Mon, 3 Nov 2014 09:47:08 +0000 (17:47 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Mon, 3 Nov 2014 09:47:08 +0000 (17:47 +0800)
Implement file dialog and color chooser for <input> tag

1  2 
atom.gyp
atom/browser/atom_browser_client.h
atom/browser/native_window.cc
atom/browser/native_window.h

diff --cc atom.gyp
Simple merge
Simple merge
Simple merge
Simple merge