axmol/build/cocos2d_libs.xcodeproj
Huabing.Xu 65b6500491 Merge branch 'v3' into FixCrashOnWin32
Conflicts:
	cocos/2d/CCDrawNode.cpp
	cocos/renderer/ccShaders.cpp
2015-01-20 18:09:11 +08:00
..
xcshareddata/xcschemes Adds missing xcshared data for missing projects 2014-09-05 14:32:14 -07:00
project.pbxproj Merge branch 'v3' into FixCrashOnWin32 2015-01-20 18:09:11 +08:00