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
..
res	…
HelloLua.sln	rename gui to ui	2014-03-12 10:46:49 +08:00
HelloLua.vcxproj	modify release output	2014-06-23 16:56:23 +08:00
HelloLua.vcxproj.filters	add protobuf-lite source	2014-06-18 15:43:38 +08:00
HelloLua.vcxproj.user	modify release output	2014-06-23 16:56:23 +08:00
Runtime_win32.cpp	add config parser	2014-05-05 21:04:04 +08:00
SimulatorWindow.cpp	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime	2014-06-23 17:30:33 +08:00
SimulatorWindow.h	add suport ios screen orientation set	2014-05-07 20:50:29 +08:00
build-cfg.json	modify runtime folder	2014-05-30 11:00:26 +08:00
game.rc	move win menu bar to sysmenu	2014-05-06 17:03:40 +08:00
main.cpp	Add new line at the end of a file to *.cpp	2014-06-19 20:45:24 +09:00
main.h	…
resource.h	…