godyZ 27baf5b961 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop		2013-08-07 09:32:42 +08:00
..
.externalToolBuilders	Adding missing eclipse project files	2013-03-07 12:13:50 -08:00
Classes	update s3tc #3 ,android test	2013-08-06 15:33:38 +08:00
Resources	fix bugs with new Label stuff and add new sample for unicode	2013-07-30 16:41:26 -07:00
proj.android	update s3tc #3 ,android test	2013-08-06 15:33:38 +08:00
proj.emscripten	Multi-resolution emscripten html template.	2013-08-05 09:24:47 +02:00
proj.ios	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +08:00
proj.linux	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +08:00
proj.mac	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +08:00
proj.nacl	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +08:00
proj.qt5	Qt 5 port: Fixes to build against "develop" branch	2013-07-26 08:55:46 +00:00
proj.tizen	[Tizen] CC_ENABLE_CHIPMUNK_INTEGRATION=1	2013-08-06 14:42:53 +09:00
proj.win32	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +08:00
.cproject	Adding missing eclipse project files	2013-03-07 12:13:50 -08:00
Android.mk	closed #2434:fixed path	2013-08-03 23:12:10 +08:00