Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tools/simulator/frameworks/runtime-src/proj.ios_mac/ios
History
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
..
AppController.h move simulator 2015-01-07 17:50:15 +08:00
AppController.mm move simulator 2015-01-07 17:50:15 +08:00
Default-568h@2x.png move simulator 2015-01-07 17:50:15 +08:00
Default-667h@2x.png move simulator 2015-01-07 17:50:15 +08:00
Default-736h@3x.png move simulator 2015-01-07 17:50:15 +08:00
Default.png move simulator 2015-01-07 17:50:15 +08:00
Default@2x.png move simulator 2015-01-07 17:50:15 +08:00
Icon-29.png move simulator 2015-01-07 17:50:15 +08:00
Icon-40.png move simulator 2015-01-07 17:50:15 +08:00
Icon-50.png move simulator 2015-01-07 17:50:15 +08:00
Icon-57.png move simulator 2015-01-07 17:50:15 +08:00
Icon-58.png move simulator 2015-01-07 17:50:15 +08:00
Icon-72.png move simulator 2015-01-07 17:50:15 +08:00
Icon-76.png move simulator 2015-01-07 17:50:15 +08:00
Icon-80.png move simulator 2015-01-07 17:50:15 +08:00
Icon-100.png move simulator 2015-01-07 17:50:15 +08:00
Icon-114.png move simulator 2015-01-07 17:50:15 +08:00
Icon-120.png move simulator 2015-01-07 17:50:15 +08:00
Icon-144.png move simulator 2015-01-07 17:50:15 +08:00
Icon-152.png move simulator 2015-01-07 17:50:15 +08:00
Info.plist Merge branch 'v3' into combine 2015-01-12 17:54:58 +08:00
Prefix.pch move simulator 2015-01-07 17:50:15 +08:00
RootViewController.h move simulator 2015-01-07 17:50:15 +08:00
RootViewController.mm Merge branch 'v3' into combine 2015-01-12 17:54:58 +08:00
build-cfg.json move simulator 2015-01-07 17:50:15 +08:00
main.m move simulator 2015-01-07 17:50:15 +08:00