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	Merge branch 'develop' into glview_improvements	2014-01-27 10:52:35 -08:00
Resources	issue #3837:Update the comment	2014-01-27 15:00:11 +08:00
proj.android	issue:Add luasocket's support for lua	2014-01-24 17:24:10 +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 miss websocket lib for HelloLua on vs.	2014-01-27 17:02:31 +08:00
CMakeLists.txt	Moves temp files to CURRENT_BINARY_DIR.	2014-01-06 23:44:36 -08:00