James Chen 477fc9f0e0 Merge commit 'refs/pull/6012/head' of git://github.com/cocos2d/cocos2d-x into pull/6012 ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj		2014-04-25 10:59:11 +08:00
..
cpp-empty-test	input event refactor. console enabled for wp8	2014-04-19 10:10:44 -07:00
cpp-tests	Merge commit 'refs/pull/6012/head' of git://github.com/cocos2d/cocos2d-x into pull/6012	2014-04-25 10:59:11 +08:00
lua-empty-test	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_test	2014-03-27 11:21:20 +08:00
lua-tests	fix the bugs of SpriteTest that the Sprite created by passing rect display error	2014-04-22 13:41:10 +08:00