James Chen 31199183b2 Merge commit 'refs/pull/5086/head' of git://github.com/cocos2d/cocos2d-x into new-label-atlas		2014-01-17 11:10:04 +08:00
..
Cpp	Merge commit 'refs/pull/5086/head' of git://github.com/cocos2d/cocos2d-x into new-label-atlas	2014-01-17 11:10:04 +08:00
Javascript	closed #3714, Remove configurations which are not necessary in AndroidManifest.xml of aneroid projects.	2014-01-15 17:27:53 +08:00
Lua	closed #3714, Remove configurations which are not necessary in AndroidManifest.xml of aneroid projects.	2014-01-15 17:27:53 +08:00
CMakeLists.txt	issue #3113: [Linux] Adding options for modules.	2013-11-06 19:17:34 +08:00