Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tests/test.win32
History
yangws 333f0b5574 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 
Conflicts:
	HelloWorld/AppDelegate.cpp
	cocos2dx/particle_nodes/CCParticleSystem.cpp
	cocos2dx/proj.win32/cocos2d-win32.vcproj
	tests/AppDelegate.cpp
 		2011-01-20 11:18:35 +08:00
..
copy_res.bat merge tests/proj.uphone & framework.uphone, merge tests/proj.win32 & framework.win32 2010-12-20 12:47:56 +08:00
main.cpp merge tests/proj.uphone & framework.uphone, merge tests/proj.win32 & framework.win32 2010-12-20 12:47:56 +08:00
main.h merge tests/proj.uphone & framework.uphone, merge tests/proj.win32 & framework.win32 2010-12-20 12:47:56 +08:00
test.win32.vcproj Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 2011-01-20 11:18:35 +08:00