samuele3hu a547d6aa33 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_navigation ... Conflicts: tools/bindings-generator		2015-06-16 11:36:11 +08:00
..
ide-support	fix simulator compile error	2015-06-03 22:58:25 +08:00
AppDelegate.cpp	add simulator	2015-05-14 14:11:40 +08:00
AppDelegate.h	add simulator	2015-05-14 14:11:40 +08:00
js_module_register.h	add simulator	2015-05-14 14:11:40 +08:00
lua_module_register.h	Add Lua-bindings for NavMesh	2015-06-02 18:37:57 +08:00