win---
Revert "win---"

This reverts commit 11d1496355ee037247837fa572566cd810f308e2.
Revert "Revert "win---""

This reverts commit 1840e878b5500e95b621ae99a67ec9934d5bcd4e.
Merge remote-tracking branch 'origin/master'

Conflicts:
	cocos2d/external/freetype2/include/winrt/.gitignore
	cocos2d/external/freetype2/include/wp8/.gitignore
	cocos2d/external/jpeg/include/winrt/.gitignore
	cocos2d/external/jpeg/include/wp8/.gitignore
	cocos2d/external/lua/lua/prebuilt/ios/liblua.a
	cocos2d/external/lua/luajit/build_android.sh
	cocos2d/external/lua/luajit/build_ios.sh
	cocos2d/external/lua/luajit/build_mac.sh
	cocos2d/external/lua/luajit/prebuilt/android/Android.mk
	cocos2d/external/lua/luajit/prebuilt/android/armeabi-v7a/libluajit.a
	cocos2d/external/lua/luajit/prebuilt/android/armeabi/libluajit.a
	cocos2d/external/lua/luajit/prebuilt/android/x86/libluajit.a
	cocos2d/external/lua/luajit/prebuilt/ios/libluajit.a
	cocos2d/external/lua/luajit/prebuilt/mac/libluajit.a
	cocos2d/external/png/include/winrt/.gitignore
	cocos2d/external/png/include/wp8/.gitignore
	cocos2d/external/tiff/include/winrt/.gitignore
	cocos2d/external/tiff/include/wp8/.gitignore
	cocos2d/external/winrt-specific/.gitignore
	cocos2d/external/winrt-specific/zlib/include/.gitignore
	cocos2d/external/wp8-specific/zlib/include/.gitignore
	cocos2d/tools/fbx-conv/mac/fbx-conv
Merge branch 'master' of https://github.com/Z-starts/SkipWhite
Merge branch 'master' of https://github.com/Z-starts/SkipWhite
win开发环境修改