打开看了一眼

打开看了一眼
Merge branch 'master' of https://github.com/yangjunfeng22/LittleGame

Conflicts:
	proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj

proj.ios_mac/HelloCpp.xcodeproj/project.xcworkspace/xcuserdata/yang.xcus
erdatad/UserInterfaceState.xcuserstate
改了工程配置

改了工程配置