James Chen aeafe06d7f Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor ... Conflicts: cocos/scripting/lua/bindings/lua_cocos2dx_manual.cpp		2013-12-23 11:57:29 +08:00
..
bindings	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor	2013-12-23 11:57:29 +08:00
script	bind gui and studio.	2013-11-18 16:54:52 +08:00