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
..
Res	Replace expat with libxml2, added libxml2 libraries and header files. Library built from: https://github.com/marmalade/marmalade-libxml2	2011-12-06 18:32:36 -08:00
test.android	issue 892: add cpp flag to support rtti on android	2011-12-07 16:51:54 +08:00
test.bada	remove some '__QNX__' macros	2011-12-12 16:14:12 +08:00
test.ios	change file structure in xcode view	2011-12-01 16:27:11 +08:00
test.linux	fixed #850: update Box2d for linux	2011-11-29 17:12:21 +08:00
test.marmalade	Added marmalade support, removed airplay	2011-12-11 10:19:41 +01:00
test.qnx	modify all projects config	2011-12-09 17:03:11 +08:00
test.win32	update box2d to version2.2.1	2011-11-25 18:30:27 +08:00
test.wophone	fixed #702 tests crashs at the start on wophone device	2011-08-30 15:59:06 +08:00
tests	#issue 908: Merge marmalade to latest cocos2d-x source	2011-12-12 17:46:21 +08:00
Android.mk	fixed #838: tests and HelloLua support x86	2011-11-23 15:51:30 +08:00
AppDelegate.cpp	#issue 908: Merge marmalade to latest cocos2d-x source	2011-12-12 17:46:21 +08:00
AppDelegate.h	issue #375: rename file names and object names	2011-03-07 17:11:57 +08:00