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
..
Classes	delete the project configurations in base folder	2011-09-07 12:41:39 +08:00
Linux	make create-linux-android-project.sh works ok	2011-09-29 00:49:49 -07:00
Resource	[airplay] fix - if you do not use this "MemFlags0 = USE_STACK_ALLOCATOR" then it solves the problems related to incorrect memory allocation ... I tested it on Marmalade Mac Simulator and IPad device. Not tested on Maramlade Windows Simulator....	2011-07-09 13:04:29 -07:00
airplay	[airplay] move .mkf to proj.airplay folder, improve SimpleAudioEngine implementation, integrate chipmunk	2011-04-04 00:40:39 +08:00
android	modify proj setting because all cpp files of HelloWorld are moved into Classes	2011-09-28 16:46:53 +08:00
bada	add HelloWorld Icons folder	2011-09-29 10:21:20 +08:00
ios	modify proj setting because all cpp files of HelloWorld are moved into Classes	2011-09-28 16:46:53 +08:00
iphone/HelloWorld.xcodeproj	Merge branch 'master' into bada	2011-09-19 13:42:08 +08:00
win32	add files from HelloWorld/Classes	2011-09-28 17:31:50 +08:00
wophone	update wophone setup project (such as helloworld,tests)	2011-06-30 09:36:51 +08:00