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
Ricardo Quesada 79ebc546f8 Merge remote-tracking branch 'cocos2d/v3' into normalized_position 
Conflicts:
	CHANGELOG
	cocos/ui/UILayout.cpp
 		2014-06-04 09:19:22 -07:00
..
Sprite3DTest.cpp Merge remote-tracking branch 'cocos2d/v3' into normalized_position 2014-06-04 09:19:22 -07:00
Sprite3DTest.h Merge remote-tracking branch 'cocos2d/v3' into normalized_position 2014-06-04 09:19:22 -07:00