boyu0 a71394b122 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect		2013-12-10 18:03:41 +08:00
..
Cpp	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect	2013-12-10 18:03:41 +08:00
Javascript	Remove something association of CDT Builder,it make 'miss error' in builders.	2013-11-22 17:41:03 +08:00
Lua	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
CMakeLists.txt	issue #3113: [Linux] Adding options for modules.	2013-11-06 19:17:34 +08:00