samuele3hu b3da322920 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer ... Conflicts: build/cocos2d_tests.xcodeproj/project.pbxproj		2014-06-26 16:21:09 +08:00
..
lua-bindings	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer	2014-06-26 16:21:09 +08:00