boyu0 4d0e3dbd8d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect		2013-12-06 18:16:26 +08:00
..
GUI	issue #3162: Merge Node and NodeRGBA, fix bug: Child's opacity will not be changed when its parent's setCascadeOpacityEnabled was set to true and opacity was changed.	2013-12-06 18:07:16 +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 #2905:modification vs-project for folder structure change	2013-10-21 22:09:21 +08:00
Android.mk	issue #2905:simplify Android.mk dependence	2013-10-18 14:18:36 +08:00
CMakeLists.txt	[cmake] output lib to root/lib	2013-11-04 21:03:08 +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