Merge pull request #3030 from atom/fix-xcode-6
authorCheng Zhao <zcbenz@gmail.com>
Thu, 8 Oct 2015 02:31:41 +0000 (10:31 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Thu, 8 Oct 2015 02:31:41 +0000 (10:31 +0800)
Fix building with Xcode 6


Trivial merge