axmol/HelloLua/Resource
Phenix Yu 786feb6a8d 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
..
background.mp3.REMOVED.git-id Added CocsDenshion lua support and tested with HelloLua on iOS 2011-08-16 23:56:41 +08:00
farm.jpg.REMOVED.git-id improve HelloLua, rename images, add error msg in LuaEngine, refactor hello.lua, add RootViewController. issue 2011-06-24 17:00:14 +08:00
hello.lua Merge remote-tracking branch 'remotes/upstream/master' 2011-11-15 14:43:55 +08:00
hello2.lua issue : require works ok on android 2011-09-05 17:13:52 +08:00