Nite Luo be71eb8626 Merge branch 'develop' into newRenderer ... Conflicts: .gitignore build/cocos2d_libs.xcodeproj/project.pbxproj build/cocos2d_samples.xcodeproj/project.pbxproj cocos/2d/CCDirector.cpp		2013-11-07 17:24:57 -08:00
..
Cpp	Merge branch 'develop' into newRenderer	2013-11-07 17:24:57 -08:00
Javascript	closed #3108: add -fsigned-char to make char to signed as default	2013-11-04 10:48:45 +08:00
Lua	issue #3113: Updating CMakeLists.txt, Improve Copying files.	2013-11-06 10:57:36 +08:00
CMakeLists.txt	issue #3113: [Linux] Adding options for modules.	2013-11-06 19:17:34 +08:00