Ricardo Quesada 1b6dfcda40 Merge branch 'develop' into cceglview_in_desktop ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj		2014-01-22 11:21:16 -08:00
..
Cpp	Merge branch 'develop' into cceglview_in_desktop	2014-01-22 11:21:16 -08:00
Javascript	issue #3713: remove unneeded codes to fix compiling error	2014-01-21 10:33:45 +08:00
Lua	fix:Replace cc.TextureCache:getInstance() —> cc.Director:getInstance():getTextureCache()	2014-01-22 17:09:33 +08:00
CMakeLists.txt	issue #3113: [Linux] Adding options for modules.	2013-11-06 19:17:34 +08:00