chuanweizhang2013 7f75b58acf Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime ... Conflicts: templates/lua-template-runtime/cocos-project-template.json		2014-06-23 17:30:33 +08:00
..
Classes	add stubs head	2014-06-23 15:07:49 +08:00
proj.android	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime	2014-06-23 17:30:33 +08:00
proj.ios_mac	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime	2014-06-23 17:30:33 +08:00
proj.win32	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime	2014-06-23 17:30:33 +08:00