8 Commits

Author	SHA1	Message	Date
samuele3hu	cf0aa36c15	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module ... Conflicts: cocos/network/CMakeLists.txt cocos/storage/CMakeLists.txt	2014-08-07 14:02:50 +08:00
samuele3hu	0421c24d16	Modify lua-template-default and lua-template-runtime project	2014-08-07 13:54:54 +08:00
xiangxw	78587254a5	show error after a win32 lua program crashes	2014-08-05 21:10:30 +08:00
James Chen	8cbcf17163	issue #4674: Re-added deleted source files.	2014-05-04 14:37:55 +08:00
samuele3hu	d3487d2d3c	close #4400: Use the newest version of LuaSocket for lua	2014-03-20 17:04:54 +08:00
andyque	2c2a5ee38e	rename gui to ui	2014-03-12 10:46:49 +08:00
cw	133a68f614	add runtime template	2014-03-11 16:52:06 +08:00
James Chen	cf5dacb24e	Re-add lua template.	2014-03-10 19:33:57 +08:00