Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tests/cpp-tests/Classes/Sprite3DTest
History
songmiao 08a4ebba06 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into billboard 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
 		2014-08-15 17:43:04 +08:00
..
DrawNode3D.cpp 1. move drawnode3d to Sprite3DTest 2014-08-08 17:54:39 +08:00
DrawNode3D.h 1. move drawnode3d to Sprite3DTest 2014-08-08 17:54:39 +08:00
Sprite3DTest.cpp Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into billboard 2014-08-15 17:43:04 +08:00
Sprite3DTest.h Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into billboard 2014-08-15 17:43:04 +08:00