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
..
android/prebuilt	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2345_refactor_ccimage	2013-08-06 13:37:38 +08:00
common	closed #2533:updating new file copyrights	2013-08-16 15:01:22 +08:00
doc	issue #2345: edit linux command to link the libpng12-dev.lib instead of use ourselves. Move ccTexParams into CCTexture2D	2013-08-06 11:34:48 +08:00
emscripten	Remove freetype since it now works using Emscripten's SDL.	2013-05-16 17:34:33 -07:00
ios	issue #2345: fix mac crash due to libjpeg	2013-08-07 11:59:52 +08:00
linux	issue #2640: glfw linux version	2013-08-28 12:00:06 +08:00
mac	issue #2460: add glfw include and library file to Xcode	2013-08-16 15:43:25 +08:00
tizen	[Tizen] Enable LocalStorage	2013-08-07 19:01:41 +09:00
win32	issue #2460: glfw window version	2013-08-20 13:57:15 +08:00