chuanweizhang2013 31aa374fe8 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime		2014-07-16 18:20:44 +08:00
..
cpp-template-default	updated cpp template to support EVENT_RENDERER_RECREATED	2014-07-15 07:23:40 -07:00
lua-template-default	Remove glView setting form cpp to lua script and remove lua bindings for Bone3D	2014-07-11 16:00:02 +08:00
lua-template-runtime	fixed living code bug	2014-07-16 18:19:33 +08:00
cocos2dx_files.json	[AUTO][ci skip]: updating cocos2dx_files.json	2014-07-15 09:06:46 +00:00