axmol/templates
cw c0fe791aae Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into luaruntime
Conflicts:
	templates/lua-template-runtime/src/main.lua
2014-04-04 18:17:54 +08:00
..
cpp-template-default Updates templates for linux platform 2014-04-01 01:49:24 -07:00
lua-template-default Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into luaruntime 2014-04-04 18:17:54 +08:00
lua-template-runtime Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into luaruntime 2014-04-04 18:17:54 +08:00
cocos2dx_files.json.REMOVED.git-id [AUTO][ci skip]: updating cocos2dx_files.json 2014-04-03 09:42:36 +00:00