andyque cb5b2a4f85 issue #4861, Merge branch 'v3' into focus3861 ... Conflicts: build/cocos2d_tests.xcodeproj/project.pbxproj		2014-05-05 17:40:28 +08:00
..
xcshareddata/xcschemes	rollback the scheme mode of projects	2014-03-20 17:01:21 +08:00
project.pbxproj	issue #4861, Merge branch 'v3' into focus3861	2014-05-05 17:40:28 +08:00