James Chen 2133c0e566 Merge commit 'refs/pull/3938/head' of git://github.com/cocos2d/cocos2d-x into drawnode ... Conflicts: cocos/2d/CCDrawNode.h		2014-01-09 17:03:08 +08:00
..
.externalToolBuilders	…
Classes	Merge commit 'refs/pull/3938/head' of git://github.com/cocos2d/cocos2d-x into drawnode	2014-01-09 17:03:08 +08:00
Resources	Renames resource folder name from 'loadXXX' to 'LoadXXX'	2014-01-06 13:47:11 +08:00
proj.android	update describe for support translucency on android	2013-12-30 18:12:43 +08:00
proj.ios	issue #2800:Can not hide status bar on iOS 7	2013-09-13 15:54:58 +08:00
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	Add Trigger code to sceneTest on cocos2dx 3.x.	2014-01-06 16:32:39 +08:00
.cproject	…
Android.mk	issue #3677: Updates Makefile.	2014-01-04 11:41:05 +08:00
CMakeLists.txt	Moves temp files to CURRENT_BINARY_DIR.	2014-01-06 23:44:36 -08:00