dumganhar 4b9cbb85ff #issue 908: Merge marmalade to latest cocos2d-x source ... Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade Conflicts: cocos2dx/platform/CCFileUtils.cpp cocos2dx/platform/CCPlatformConfig.h cocos2dx/support/zip_support/ioapi.cpp		2011-12-12 17:46:21 +08:00
..
Collision	issue #850: test box2d2.2.1 on bada	2011-11-28 19:03:10 +08:00
Common	remove some '__QNX__' macros	2011-12-12 16:14:12 +08:00
Dynamics	update box2d to version2.2.1	2011-11-25 18:30:27 +08:00
Rope	update box2d to version2.2.1	2011-11-25 18:30:27 +08:00
proj.bada	remove some '__QNX__' macros	2011-12-12 16:14:12 +08:00
proj.linux	issue #850: update Makefile for Box2d	2011-11-29 17:43:11 +08:00
proj.marmalade	Added marmalade support, removed airplay	2011-12-11 10:19:41 +01:00
proj.qnx	modify all projects config	2011-12-09 17:03:11 +08:00
proj.win32	fixed #580: update Box2d for vs2010	2011-12-01 10:08:15 +08:00
proj.wophone	[wophone]fixed #386,Resolve the compile conflict on wophone sdk.Modify the makefiles for wophone.	2011-03-10 14:24:13 +08:00
Android.mk	issue #850: update box2d for iOS and android	2011-11-29 15:16:16 +08:00
Box2D.h	update box2d to version2.2.1	2011-11-25 18:30:27 +08:00