samuelhu 7c45ddafe2 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj		2013-10-31 17:22:14 +08:00
..
auto-generated@4fd4e14912	Updating auto generated binding codes.	2013-10-29 15:09:13 +08:00
javascript	closed #3093: The last test of OpenglTest crashes on Windows.	2013-10-31 16:27:00 +08:00
lua	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager	2013-10-31 17:22:14 +08:00