James Chen f88aa5058d Merge branch 'gles20' of https://github.com/rohankuruvilla/cocos2d-x into rohan-ccb ... Conflicts: scripting/javascript/bindings/cocos2d_specifics.cpp scripting/javascript/bindings/cocos2d_specifics.hpp tools/tojs/cocos2dx.ini		2012-11-02 18:15:25 +08:00
..
cxx-generator@6e14e97554	Updated the submodule of tools/cxx-generator.	2012-10-26 09:57:01 +08:00
jenkins_scripts	Updated jenkins_scripts/mac/android/generate-js-cxx-bindings.sh.	2012-10-30 17:54:48 +08:00
lua_project_generator	Reverted build_native.sh.	2012-06-28 16:58:32 +08:00
tojs	Merge branch 'gles20' of https://github.com/rohankuruvilla/cocos2d-x into rohan-ccb	2012-11-02 18:15:25 +08:00
tolua++	Updated LuaBindings codes since CCEGLViewProtocol::getSize has been renamed to CCEGLViewProtocol::getDesignResolutionSize.	2012-10-30 10:35:19 +08:00
xcode4_template_generator	fixed #1482, deal with ios6 orientation in templates/xcode4, with a little refactoring.	2012-09-23 22:11:29 +08:00