axmol/templates/lua-template-default/frameworks/runtime-src/proj.win32
samuele3hu 074216bef9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d
Conflicts:
	templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h
	tests/lua-tests/src/mainMenu.lua
2015-05-24 22:46:05 +08:00
..
res removed framework of simulator 2015-03-10 10:51:16 +08:00
HelloLua.sln move menu bar to system menu 2015-05-14 13:43:17 +08:00
HelloLua.vcxproj Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d 2015-05-24 22:46:05 +08:00
HelloLua.vcxproj.filters revert lua runtime 2015-04-02 18:27:53 +08:00
HelloLua.vcxproj.user 1. Compatible vs2012 for libsimulator 2015-01-15 11:10:32 +08:00
SimulatorWin.cpp move menu bar to system menu 2015-05-14 13:43:17 +08:00
SimulatorWin.h removed framework of simulator 2015-03-10 10:51:16 +08:00
build-cfg.json add lua runtime template 2015-04-21 01:25:44 +08:00
game.rc removed framework of simulator 2015-03-10 10:51:16 +08:00
main.cpp removed framework of simulator 2015-03-10 10:51:16 +08:00
main.h removed framework of simulator 2015-03-10 10:51:16 +08:00
resource.h move menu bar to system menu 2015-05-14 13:43:17 +08:00
stdafx.cpp update lua-template-default 2015-01-12 23:42:37 +08:00
stdafx.h update lua-template-default 2015-01-12 23:42:37 +08:00
targetver.h update lua-template-default 2015-01-12 23:42:37 +08:00