axmol/cocos/scripting/lua
James Chen d33b2c41c7 Merge branch 'develop' into data-refactor
Conflicts:
	tools/tolua/cocos2dx.ini
2013-12-24 16:24:17 +08:00
..
bindings Merge branch 'develop' into data-refactor 2013-12-24 16:24:17 +08:00
script [LUA] Removes CCCameraDeprecated table in Deprecated.lua. 2013-12-23 16:37:40 +08:00