James Chen 71d21d2e10 Merge commit 'refs/pull/4761/head' of git://github.com/cocos2d/cocos2d-x into gui-rename		2013-12-31 19:13:59 +08:00
..
Cpp	Modify class name Label LabelBMFont LabelAtlas	2013-12-31 16:36:33 +08:00
Javascript	Updates JS-test submodule.	2013-12-31 18:15:47 +08:00
Lua	update describe for support translucency on android	2013-12-30 18:12:43 +08:00
CMakeLists.txt	issue #3113: [Linux] Adding options for modules.	2013-11-06 19:17:34 +08:00