Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/build/cocos2d_tests.xcodeproj
History
Huabing.Xu 84540c1ff4 Merge branch 'v3' into v3_CameraMaskFor2DAnd3DRendering 
Conflicts:
	cocos/renderer/CCGLProgramCache.cpp
	tests/cpp-tests/Classes/controller.cpp
 		2015-05-14 11:55:10 +08:00
..
xcshareddata/xcschemes Ouch. DEBUG instead of RELEASE for Build on Xcode 2014-11-27 10:54:09 -08:00
project.pbxproj Merge branch 'v3' into v3_CameraMaskFor2DAnd3DRendering 2015-05-14 11:55:10 +08:00