axmol/cocos/scripting
bmanGH b55aec2fa0 Merge remote-tracking branch 'upstream/develop' into develop
Conflicts:
	cocos/scripting/auto-generated
	tools/bindings-generator
2013-12-09 14:59:17 +08:00
..
auto-generated@f399ed2207 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-09 03:53:01 +00:00
javascript issue #2790: Removes unused CCSet binding glue codes. 2013-12-07 14:44:21 +08:00
lua issue #3309:Modify some deprecated cpp files and lua files 2013-12-04 15:15:55 +08:00
CMakeLists.txt issue #2868:Add more ccs lua test samples 2013-11-12 15:25:47 +08:00