Merge pull request #860 from rprichard/master
authorCheng Zhao <zcbenz@gmail.com>
Tue, 25 Nov 2014 13:23:49 +0000 (21:23 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Tue, 25 Nov 2014 13:23:49 +0000 (21:23 +0800)
Move Linux pkg-config dependencies from atom-shell to brightray.

1  2 
atom.gyp

diff --cc atom.gyp
Simple merge