James Chen 08cd81ff43 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into move-auto-generated ... Conflicts: scripting/auto-generated		2013-08-27 16:59:59 +08:00
..
Cpp	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into move-auto-generated	2013-08-27 16:59:59 +08:00
Javascript	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into move-auto-generated	2013-08-27 16:59:59 +08:00
Lua	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into move-auto-generated	2013-08-27 16:59:59 +08:00
samples.xcodeproj	issue #2732: [iOS] Updating the reference of auto-generated binding glue codes.	2013-08-27 16:05:48 +08:00