samuelhu de4b4dcc73 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developLuaOcBridge		2013-10-31 15:23:25 +08:00
..
auto-generated@4fd4e14912	Updating auto generated binding codes.	2013-10-29 15:09:13 +08:00
javascript	fixed #3048: rename some comments	2013-10-31 14:36:17 +08:00
lua	issue #3069:Add LuaObjectCBridge and related test sample	2013-10-31 15:20:53 +08:00