James Chen 2133c0e566 Merge commit 'refs/pull/3938/head' of git://github.com/cocos2d/cocos2d-x into drawnode ... Conflicts: cocos/2d/CCDrawNode.h		2014-01-09 17:03:08 +08:00
..
Cpp	Merge commit 'refs/pull/3938/head' of git://github.com/cocos2d/cocos2d-x into drawnode	2014-01-09 17:03:08 +08:00
Javascript	Updates JS-Test submodule.	2014-01-07 18:01:22 +08:00
Lua	Fix:Replace the “setDisplayFrame” function with the “setSpriteFrame” function	2014-01-07 20:39:46 +08:00
CMakeLists.txt	issue #3113: [Linux] Adding options for modules.	2013-11-06 19:17:34 +08:00