Commit Graph

55 Commits

Author SHA1 Message Date
andyque cb5b2a4f85 issue #4861, Merge branch 'v3' into focus3861
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
2014-05-05 17:40:28 +08:00
James Chen 67b2fbf14b Updates xcode project, add ccs-res folder to Resources folder 2014-05-05 15:24:33 +08:00
James Chen d82e03b048 Xcode project fix 2014-05-05 13:31:38 +08:00
andyque a7fbd590dc issue #4861. add a horizontal focus test 2014-05-05 11:37:39 +08:00
James Chen 8cbcf17163 issue #4674: Re-added deleted source files. 2014-05-04 14:37:55 +08:00