James Chen 208f705845 Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-develop ... Conflicts: cocos2d_libs.xcodeproj/project.pbxproj samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h		2013-09-16 18:18:23 +08:00
..
.externalToolBuilders	Adding missing eclipse project files	2013-03-07 12:13:50 -08:00
Classes	Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-develop	2013-09-16 18:18:23 +08:00
Resources	Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-develop	2013-09-16 18:18:23 +08:00
proj.android	Add parameter in method cocos_android_app_init() to initialize plugin.	2013-09-02 16:10:08 +08:00
proj.emscripten	[dispatcher] Adding new EventDispatcher Test to Makefile and project.	2013-09-13 18:08:00 +08:00
proj.ios	issue #2800:Can not hide status bar on iOS 7	2013-09-13 15:54:58 +08:00
proj.linux	[dispatcher] Adding new EventDispatcher Test to Makefile and project.	2013-09-13 18:08:00 +08:00
proj.mac	issue #2460: optimize EGLView interface	2013-08-29 11:36:16 +08:00
proj.nacl	[dispatcher] Adding new EventDispatcher Test to Makefile and project.	2013-09-13 18:08:00 +08:00
proj.qt5	[dispatcher] Adding new EventDispatcher Test to Makefile and project.	2013-09-13 18:08:00 +08:00
proj.tizen	[Tizen] Update project files.	2013-08-25 02:22:50 +09:00
proj.win32	Merge pull request #3597 from chengstory/#4560	2013-09-15 20:23:05 -07:00
.cproject	Adding missing eclipse project files	2013-03-07 12:13:50 -08:00
Android.mk	[dispatcher] Adding new EventDispatcher Test to Makefile and project.	2013-09-13 18:08:00 +08:00