Ricardo Quesada 73b1e3bb9e Merge branch 'develop' into newRenderer ... Conflicts: cocos/2d/CCLabelAtlas.cpp cocos/2d/CCSprite.cpp		2013-12-06 09:37:08 -08:00
..
Cpp	Merge branch 'develop' into newRenderer	2013-12-06 09:37:08 -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