axmol/samples/Lua/HelloLua
samuele3hu 7f8099ce69 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	tools/bindings-generator
2013-08-15 16:21:32 +08:00
..
Classes issue #2430: Refactoring enum 'ResolutionPolicy'. 2013-07-26 18:18:58 +08:00
Resources issue #2433:Modify lua binding generator template and releated action test 2013-08-14 21:35:55 +08:00
proj.android Update nojava.txt with readme. 2013-08-07 12:29:58 -07:00
proj.emscripten issue #2404:Modify configs 2013-07-22 09:36:00 +08:00
proj.ios issue #2397: Application::sharedApplication --> Application::getInstance. 2013-07-15 16:24:42 +08:00
proj.linux issue #2404:Modify configs 2013-07-22 09:36:00 +08:00
proj.mac issue #2397: Application::sharedApplication --> Application::getInstance. 2013-07-15 16:24:42 +08:00
proj.nacl issue #2397: Application::sharedApplication --> Application::getInstance. 2013-07-15 16:24:42 +08:00
proj.tizen [Tizen] Enable LocalStorage 2013-08-07 19:01:41 +09:00
proj.win32 issue #2404:Modify configs 2013-07-22 09:36:00 +08:00