Ricardo Quesada efaec7b7ec Merge branch 'develop' into glview_improvements ... Conflicts: samples/Lua/HelloLua/Classes/AppDelegate.cpp template/multi-platform-lua/Classes/AppDelegate.cpp		2014-01-27 10:52:35 -08:00
..
Classes	more fixes for new GLView API	2014-01-23 16:04:11 -08:00
Resources	issue #1733: Adding "multi-platform-cpp" and "multi-platform-lua" projects to template folder.	2013-02-19 15:38:30 +08:00
proj.android	fix get_num_of_cpu on win32.	2014-01-24 18:30:37 +08:00
proj.ios_mac	Fixes couldn't find CCEGLView.h in main.cpp of template.	2014-01-23 18:15:02 +08:00
proj.linux	Fixes couldn't find CCEGLView.h in main.cpp of template.	2014-01-23 18:15:02 +08:00
proj.win32	Fixes couldn't find CCEGLView.h in main.cpp of template.	2014-01-23 18:15:02 +08:00
CMakeLists.txt	issue #3823: Removes glfw, curl include and library path. They are installed to system.	2014-01-23 01:05:48 -08:00