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	GLView improvements	2014-01-23 15:36:55 -08:00
Resources	issue #3401: bug fix	2014-01-27 14:10:23 +08:00
proj.android	closed #3714, Remove configurations which are not necessary in AndroidManifest.xml of aneroid projects.	2014-01-15 17:27:53 +08:00
proj.ios	GLView improvements	2014-01-23 15:36:55 -08:00
proj.linux	Deletes unused Makefile for linux.	2014-01-06 19:36:13 -08:00
proj.mac	GLView improvements	2014-01-23 15:36:55 -08:00
proj.win32	fix compiling error and miss file on vs.	2014-01-04 12:25:12 +08:00
.gitignore	issue #2103 add cocosbuilder lua test sample	2013-06-05 15:17:00 +08:00
CMakeLists.txt	Moves temp files to CURRENT_BINARY_DIR.	2014-01-06 23:44:36 -08:00