Merge branch 'master' into nativeimage_ico_support_windows
authorEran Tiktin <eran.t@mce-sys.com>
Thu, 20 Aug 2015 14:11:52 +0000 (17:11 +0300)
committerEran Tiktin <eran.t@mce-sys.com>
Thu, 20 Aug 2015 14:11:52 +0000 (17:11 +0300)
1  2 
atom/common/api/atom_api_native_image.cc
docs/api/native-image.md

Simple merge