samuele3hu 88be8606b9 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developPerf		2014-01-21 16:46:28 +08:00
..
Cpp	closed #3789: EventDispatcher supports sorting listeners by global Z and local Z order. And adds relevant test case.	2014-01-21 10:23:05 +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	close #3802: Add some manual lua-binding functions for the Lable and update the related test cases	2014-01-21 16:36:29 +08:00
CMakeLists.txt	issue #3113: [Linux] Adding options for modules.	2013-11-06 19:17:34 +08:00