James Chen 113fa9924e Merge pull request #4550 from dumganhar/merge-pr-4532 ... Merge pr 4532		2013-12-18 20:12:18 -08:00
..
.externalToolBuilders	Adding missing eclipse project files	2013-03-07 12:13:50 -08:00
Classes	Merge pull request #4550 from dumganhar/merge-pr-4532	2013-12-18 20:12:18 -08:00
Resources	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2013-11-06 16:06:37 +08:00
proj.android	Remove something association of CDT Builder,it make 'miss error' in builders.	2013-11-22 17:41:03 +08:00
proj.ios	issue #2800:Can not hide status bar on iOS 7	2013-09-13 15:54:58 +08:00
proj.linux	Merge folder changes from develop	2013-10-30 23:19:36 -07:00
proj.mac	Icons for test projects	2013-10-16 11:55:14 -07:00
proj.win32	update vs project for new renderer and fix compiling fail on vs.	2013-12-18 14:36:49 +08:00
.cproject	Adding missing eclipse project files	2013-03-07 12:13:50 -08:00
Android.mk	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer	2013-12-17 15:50:24 +08:00
CMakeLists.txt	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer	2013-12-17 15:50:24 +08:00