Huabing.Xu e935481361 Merge branch 'develop' into Iss2460-glfw-refractor ... Conflicts: cocos2d_libs.xcodeproj/project.pbxproj cocos2dx/platform/mac/CCEGLView.mm samples/Cpp/TestCpp/proj.linux/main.cpp samples/Cpp/TestCpp/proj.win32/main.cpp		2013-08-28 13:42:22 +08:00
..
.externalToolBuilders	Adding missing eclipse project files	2013-03-07 12:13:50 -08:00
Classes	Little performance improvements	2013-08-26 18:08:21 -07:00
Resources	fix bugs with new Label stuff and add new sample for unicode	2013-07-30 16:41:26 -07:00
proj.android	fix warnings on ndk-r9	2013-08-26 18:02:51 +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 #2640: glfw linux version	2013-08-28 12:00:06 +08:00
proj.mac	issue #2460: glfw mac version	2013-08-21 12:01:56 +08:00
proj.nacl	issue #2488: Updating makefile for linux and emscripten.	2013-08-15 21:44:51 +08:00
proj.qt5	closed #2517: Use LocalVarToAuto.py to change Samples src file	2013-08-16 16:05:27 +08:00
proj.tizen	[Tizen] Update project files.	2013-08-25 02:22:50 +09:00
proj.win32	issue #2460: glfw win32 project file	2013-08-21 12:02:21 +08:00
.cproject	Adding missing eclipse project files	2013-03-07 12:13:50 -08:00
Android.mk	closed #2434: Use the origin android.mk files instead use templates	2013-08-22 16:45:40 +08:00