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/Resources/Sprite3DTest
History
lvlong 742ea7f2df Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 
Conflicts:
	cocos/2d/cocos2d.vcxproj.filters
	cocos/3d/CCBundle3D.cpp
	cocos/3d/CCBundle3D.h
 		2014-06-12 15:53:41 +08:00
..
boss.obj Squashed commit of the following: 2014-05-18 14:49:16 -07:00
boss.png Squashed commit of the following: 2014-05-18 14:49:16 -07:00
boss1.obj Squashed commit of the following: 2014-05-18 14:49:16 -07:00
cube_anim.c3t Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-06-12 15:53:41 +08:00
test.c3t Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-06-12 15:53:41 +08:00