Ricardo Quesada 7a8707cb08 Merge branch 'develop' into local_z_Order_fixes ... Conflicts: cocos/2d/CCNode.cpp cocos/2d/CCNode.h		2014-01-21 10:10:50 -08:00
..
Cpp	Merge branch 'develop' into local_z_Order_fixes	2014-01-21 10:10:50 -08:00
Javascript	issue #3713: remove unneeded codes to fix compiling error	2014-01-21 10:33:45 +08:00
Lua	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBugFix	2014-01-21 17:52:13 +08:00
CMakeLists.txt	issue #3113: [Linux] Adding options for modules.	2013-11-06 19:17:34 +08:00