samuele3hu e2596bce8b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger ... Conflicts: tools/tojs/cocos2dx.ini tools/tolua/cocos2dx.ini		2014-02-20 17:20:51 +08:00
..
bindings	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss4058-ref-step1	2014-02-20 15:13:40 +08:00
script	close #4094:Add deprected support for EGLView and EGLViewProtocol on the lua binding	2014-02-20 15:10:34 +08:00
CMakeLists.txt	Linux javascript bindings support.	2014-02-13 01:42:14 +01:00