boyu0 a71394b122 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect		2013-12-10 18:03:41 +08:00
..
GUI	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect	2013-12-10 18:03:41 +08:00
assets-manager	use Schedule::performFunctionInCocosThread	2013-12-06 14:15:01 +08:00
physics-nodes	issue #2905:make cocostudio and gui flat	2013-10-16 16:48:39 +08:00
proj.win32	issue #2790: Removes CCSort.h/.cpp from projects.	2013-12-07 14:21:01 +08:00
Android.mk	issue #2790: Removes CCSort.h/.cpp from projects.	2013-12-07 14:21:01 +08:00
CMakeLists.txt	issue #2790: Removes CCSort.h/.cpp from projects.	2013-12-07 14:21:01 +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	issue #2905: testcpp bild ok on Android	2013-10-15 18:00:03 +08:00