kaile.yin b924dafe83 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 ... Conflicts: cocos/2d/libcocos2d.vcxproj.filters tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp		2014-12-22 11:14:31 +08:00
..
lua-bindings	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3	2014-12-22 11:14:31 +08:00