diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2017-07-10 11:22:55 -0400 |
|---|---|---|
| committer | Joel Fischer <joeljfischer@gmail.com> | 2017-07-10 11:23:00 -0400 |
| commit | 2a17605af1d29aa3659b976d01ac68a244669040 (patch) | |
| tree | b6cdf93ecd27434490b59c9f33507d77d7e8c660 /SmartDeviceLink-iOS.xcodeproj | |
| parent | 5cb4eb22671aafdbacacdc03d21746bb9421c6b8 (diff) | |
| parent | 3d4f38fa59ca64b5ed8abd7a044fcca08aaecf4c (diff) | |
| download | sdl_ios-2a17605af1d29aa3659b976d01ac68a244669040.tar.gz | |
Merge branch 'master' into release/5.0.0
# Conflicts:
# SmartDeviceLink-iOS.xcodeproj/project.pbxproj
# SmartDeviceLink_Example/Classes/ProxyManager.m
Diffstat (limited to 'SmartDeviceLink-iOS.xcodeproj')
| -rw-r--r-- | SmartDeviceLink-iOS.xcodeproj/project.pbxproj | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj index 92d401e86..03656dc71 100644 --- a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj +++ b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj @@ -4244,7 +4244,7 @@ TargetAttributes = { 5D4019AE1A76EC350006B0C2 = { CreatedOnToolsVersion = 6.1.1; - DevelopmentTeam = ACNGAAM3M7; + DevelopmentTeam = NCVC2MHU7M; SystemCapabilities = { com.apple.BackgroundModes = { enabled = 1; @@ -5130,7 +5130,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; - DEVELOPMENT_TEAM = ACNGAAM3M7; + DEVELOPMENT_TEAM = NCVC2MHU7M; INFOPLIST_FILE = "$(SRCROOT)/SmartDeviceLink_Example/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -5145,7 +5145,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; - DEVELOPMENT_TEAM = ACNGAAM3M7; + DEVELOPMENT_TEAM = NCVC2MHU7M; INFOPLIST_FILE = "$(SRCROOT)/SmartDeviceLink_Example/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; |
