Merge branch 'master' into desktop-capture-api
authorCheng Zhao <zcbenz@gmail.com>
Tue, 8 Dec 2015 04:43:44 +0000 (12:43 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Tue, 8 Dec 2015 04:43:44 +0000 (12:43 +0800)
commit04f7ceab737d88e9adcc825cf8487eae5a0b1be9
treee9a5d6320d5c8054f4bc54acdbbc406d0024ef5b
parent9c861b9ad37a9c6335dde2e59d3005742fe75150
parented2c18c7248b2e8f0471c755701d413ed2514d44
Merge branch 'master' into desktop-capture-api
atom.gyp
atom/browser/lib/init.coffee
atom/common/node_bindings.cc
docs/README.md
filenames.gypi