axmol/tests/test.win32
yangws 1a17f3ea55 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
Conflicts:
	cocos2dx/platform/win32/CCXApplication_win32.cpp
	tests/test.win32/test.win32.vcproj
2011-01-22 17:52:06 +08:00
..
Application.cpp HelloWorld and tests can run after move ccxApplication. 2011-01-22 17:30:00 +08:00
Application.h HelloWorld and tests can run after move ccxApplication. 2011-01-22 17:30:00 +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 HelloWorld and tests can run after move ccxApplication. 2011-01-22 17:30:00 +08:00
main.h Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 2011-01-22 17:52:06 +08:00
test.win32.vcproj Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 2011-01-22 17:52:06 +08:00