Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/lua/cocos2dx_support/LuaCocos2d.cpp.REMOVED.git-id

1 line
40 B
Plaintext
Raw Normal View History

Merge remote-tracking branch 'remotes/upstream/master' Conflicts: HelloLua/Classes/AppDelegate.cpp HelloLua/Resource/hello.lua HelloLua/ios/HelloLua.xcodeproj/project.pbxproj HelloLua/win32/HelloLua.win32.vcproj HelloLua/win32/HelloLua.win32.vcxproj.filters cocos2dx/include/ccMacros.h cocos2dx/platform/ios/AccelerometerDelegateWrapper.mm lua/cocos2dx_support/LuaCocos2d.cpp lua/cocos2dx_support/LuaEngineImpl.cpp template/xcode3/cocos2d-x_lua_app/___PROJECTNAME___.xcodeproj/project.pbxproj template/xcode4/cocos2dx_lua.xctemplate/Resources/hello.lua template/xcode4/cocos2dx_lua.xctemplate/TemplateInfo.plist tests/test.win32/test.win32.vcxproj.filters
2011-11-15 14:43:55 +08:00
2f903a43ea4e1779135db8dc1c7f8a12b55398fa