axmol/tools/simulator/libsimulator/lib/platform/win32
yinjimmy 0978a88b7f Merge branch 'v3' into combine
Conflicts:
	templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk
	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
	templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj
	templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp
	templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
	tools/simulator/frameworks/runtime-src/proj.android/jni/Android.mk
	tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj
2015-01-12 17:54:58 +08:00
..
DeviceEx-win32.cpp add libsimulator 2015-01-08 14:10:28 +08:00
PlayerEditBoxServiceWin.cpp add libsimulator 2015-01-08 14:10:28 +08:00
PlayerEditBoxServiceWin.h add libsimulator 2015-01-08 14:10:28 +08:00
PlayerFileDialogServiceWin.cpp add libsimulator 2015-01-08 14:10:28 +08:00
PlayerFileDialogServiceWin.h add libsimulator 2015-01-08 14:10:28 +08:00
PlayerMenuServiceWin.cpp add libsimulator 2015-01-08 14:10:28 +08:00
PlayerMenuServiceWin.h add libsimulator 2015-01-08 14:10:28 +08:00
PlayerMessageBoxServiceWin.cpp add libsimulator 2015-01-08 14:10:28 +08:00
PlayerMessageBoxServiceWin.h add libsimulator 2015-01-08 14:10:28 +08:00
PlayerTaskServiceWin.cpp add libsimulator 2015-01-08 14:10:28 +08:00
PlayerTaskServiceWin.h add libsimulator 2015-01-08 14:10:28 +08:00
PlayerWin.cpp add libsimulator 2015-01-08 14:10:28 +08:00
PlayerWin.h add libsimulator 2015-01-08 14:10:28 +08:00
SimulatorWin.cpp Merge branch 'v3' into combine 2015-01-12 17:54:58 +08:00
SimulatorWin.h add libsimulator 2015-01-08 14:10:28 +08:00