minggo f6cfe3007f issue #2412:fix merging conflict		2013-07-23 10:41:11 +08:00
..
AssetsManager	getInstance() / destroyInstance() are used...	2013-07-11 15:24:23 -07:00
CCArmature	More unsinged int -> int in some places where it could be difficult to find underflow bugs. And some warnings fix.	2013-07-22 14:28:19 +08:00
CCBReader	CCAssert -> CCASSERT	2013-07-19 22:01:27 -07:00
Components	CCAssert -> CCASSERT	2013-07-19 22:01:27 -07:00
GUI	issue #2344: ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance	2013-07-22 17:24:54 +08:00
LocalStorage	Various linux eclipse projects compilation fixes	2013-07-09 15:23:19 +02:00
network	CCAssert -> CCASSERT	2013-07-19 22:01:27 -07:00
physics_nodes	CCAssert -> CCASSERT	2013-07-19 22:01:27 -07:00
proj.emscripten	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +08:00
proj.ios	issue #2325: Updating project configuration, tested on iPad 3.	2013-06-24 18:32:06 +08:00
proj.linux	Various linux eclipse projects compilation fixes	2013-07-09 15:23:19 +02:00
proj.mac	cocos2d-x in Mac:	2013-06-28 19:02:10 -07:00
proj.nacl	[NaCl] Fix NaCl build which had been disabled.	2013-06-20 12:56:12 -07:00
proj.tizen	[Tizen] Fix compile error.	2013-07-19 15:16:05 +09:00
proj.win32	Implements a socket.io client extension, adds a test case and updates the android makefiles.	2013-07-11 17:41:42 -04:00
spine	CCAssert -> CCASSERT	2013-07-19 22:01:27 -07:00
Android.mk	Implements a socket.io client extension, adds a test case and updates the android makefiles.	2013-07-11 17:41:42 -04:00
ExtensionMacros.h	issue #1483: Added LICENSE_CCControlExtension.txt, and added license information for headers of CCControlExtension.	2012-09-25 17:26:09 +08:00
cocos-ext.h	Merge pull request #3165 from sunzhuoshi/master	2013-07-16 02:36:49 -07:00