Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tools
History
dumganhar db4d51496e Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bada 
Conflicts:
	cocos2dx/platform/CCAccelerometer_platform.h
	cocos2dx/platform/CCApplication_platform.h
	cocos2dx/platform/CCArchOptimalParticleSystem.h
	cocos2dx/platform/CCEGLView_platform.h
	cocos2dx/platform/CCPlatformConfig.h
	cocos2dx/platform/CCSAXParser.h
	cocos2dx/platform/CCStdC.h
	tests/AppDelegate.cpp
	tests/tests/Box2DTestBed/Tests/EdgeShapes.h
 		2011-09-29 16:03:37 +08:00
..
lua_project_generator Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bada 2011-09-29 16:03:37 +08:00
tolua++ Add support for particleWithFile for both Quad & Point Particle Systems 2011-09-27 23:15:54 +01:00
xcode4_template_generator hide the xcode4 template generator script into tools folder 2011-06-25 14:20:10 +08:00