minggo ad6325b0dd fix conflicts		2013-10-12 11:31:32 +08:00
..
AssetsManager	issues #2774:AssetsManager Test downloading progress label not sync with actual download.	2013-09-29 09:48:55 +08:00
GUI	Avoid unnecessary object duplication using passing arguments by reference	2013-10-10 22:06:10 +09:00
physics_nodes	issue #2784:Add class constructor js-binding document	2013-09-13 16:46:31 +08:00
proj.linux	issue #2905: modify makefile to include correct header files	2013-10-10 17:39:53 +08:00
proj.win32	[Win32] Fixing compilation errors after renaming CocosDenshion to 'audio'.	2013-10-11 21:52:28 +08:00
Android.mk	issue #2905:modify project settings to include correct audio path	2013-10-10 15:40:06 +08:00
CCDeprecated-ext.cpp	issue #2430: Moved constant to header file to avoid errors in 'switch case', the error is 'case value is not a constant expression'.	2013-07-27 00:55:41 +08:00
CCDeprecated-ext.h	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode	2013-07-28 14:35:38 +08: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	fix line end in windows	2013-09-20 22:23:13 +08:00