James Chen 12cc6c6153 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer ... Conflicts: cocos/2d/CMakeLists.txt		2013-12-17 15:50:24 +08:00
..
Cpp	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer	2013-12-17 15:50:24 +08:00
Javascript	Remove something association of CDT Builder,it make 'miss error' in builders.	2013-11-22 17:41:03 +08:00
Lua	Fix typos	2013-11-29 12:09:38 -05:00
CMakeLists.txt	issue #3113: [Linux] Adding options for modules.	2013-11-06 19:17:34 +08:00