axmol/tests
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
..
Res Merge branch 'master' into bada 2011-09-19 13:42:08 +08:00
test.airplay fixed #621, Add Texture2dTest in tests project. 2011-07-20 15:35:20 +08:00
test.android merge cocos2d-x master 2011-09-28 15:32:30 +08:00
test.bada use timer as gameloop, can change FPS by using setAnimationInterval 2011-09-29 15:52:16 +08:00
test.ios fixed #684: add test for displaying current language 2011-08-19 11:26:14 +08:00
test.iphone/test.iphone.xcodeproj Merge branch 'master' into bada 2011-09-19 13:42:08 +08:00
test.linux make HelloWorld and tests runs ok on linux 2011-09-27 22:56:06 -07:00
test.win32 fixed #684: add test for displaying current language 2011-08-19 11:26:14 +08:00
test.wophone fixed #702 tests crashs at the start on wophone device 2011-08-30 15:59:06 +08:00
tests Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bada 2011-09-29 16:03:37 +08:00
AppDelegate.cpp Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bada 2011-09-29 16:03:37 +08:00
AppDelegate.h issue #375: rename file names and object names 2011-03-07 17:11:57 +08:00