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
..
cocos2dx.ini	Merge branch 'gles20' of https://github.com/rohankuruvilla/cocos2d-x into rohan-ccb	2012-11-02 18:15:25 +08:00
genbindings.sh	gendbings.sh generates userconf.ini	2012-09-24 21:48:12 -07:00