Ricardo Quesada 7a8707cb08 Merge branch 'develop' into local_z_Order_fixes ... Conflicts: cocos/2d/CCNode.cpp cocos/2d/CCNode.h		2014-01-21 10:10:50 -08:00
..
.externalToolBuilders	…
Classes	Merge branch 'develop' into local_z_Order_fixes	2014-01-21 10:10:50 -08:00
Resources	issue #3640: add performance test->renderer LargeTileMap test	2014-01-15 11:27:57 +08:00
proj.android	closed #3714, Remove configurations which are not necessary in AndroidManifest.xml of aneroid projects.	2014-01-15 17:27:53 +08:00
proj.ios	…
proj.linux	Deletes unused Makefile for linux.	2014-01-06 19:36:13 -08:00
proj.mac	Icons for test projects	2013-10-16 11:55:14 -07:00
proj.win32	closed #3713:add test case in vs project	2014-01-21 18:00:34 +08:00
.cproject	…
Android.mk	issue #3713:add test case for autorelease pool	2014-01-21 17:47:59 +08:00
CMakeLists.txt	issue #3713:add test case for autorelease pool	2014-01-21 17:47:59 +08:00