samuele3hu d51440f62a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DispatcherBak1 ... Conflicts: cocos/scripting/lua/bindings/lua_cocos2dx_extension_manual.cpp		2013-12-27 11:17:11 +08:00
..
bindings	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DispatcherBak1	2013-12-27 11:17:11 +08:00
script	Delete some ScriptEventType only used to Lua 、adjust the event callback mechanism and rename cc.HANDLERTYP_ related to avoid overlong	2013-12-27 10:35:44 +08:00