diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2017-08-15 16:02:14 -0400 |
|---|---|---|
| committer | Joel Fischer <joeljfischer@gmail.com> | 2017-08-15 16:02:14 -0400 |
| commit | 1a80cac24e37aff57fa069ceea7a9704de522a25 (patch) | |
| tree | 00213379a385630ee5bd9fad0aaeec5fca70480a /SmartDeviceLink-iOS.xcodeproj/project.xcworkspace | |
| parent | 88190e21888425beceb1ca61c51f69b7968b8633 (diff) | |
| parent | 671277a6b34b74cc4ccc981cf4f04c9714f51020 (diff) | |
| download | sdl_ios-1a80cac24e37aff57fa069ceea7a9704de522a25.tar.gz | |
Merge branch 'feature/616_constructed_payloads' into release/5.0.0
# Conflicts:
# SmartDeviceLink-iOS.xcodeproj/project.pbxproj
# SmartDeviceLink/SDLDebugTool.m
# SmartDeviceLink/SDLGlobals.h
# SmartDeviceLink/SDLGlobals.m
# SmartDeviceLink/SDLIAPTransport.m
# SmartDeviceLink/SDLNames.h
# SmartDeviceLink/SDLProtocol.m
# SmartDeviceLink/SDLProtocolMessage.h
# SmartDeviceLink/SDLProtocolMessage.m
# SmartDeviceLink/SDLProtocolReceivedMessageRouter.m
# SmartDeviceLink/SDLProxy.m
# SmartDeviceLink/SDLStreamingMediaManager.m
# SmartDeviceLink/SDLSystemCapability.h
# SmartDeviceLink/SDLSystemCapability.m
# SmartDeviceLink/SDLSystemCapabilityType.h
# SmartDeviceLink/SDLSystemCapabilityType.m
# SmartDeviceLink/SDLUploadFileOperation.m
# SmartDeviceLink/SDLVideoStreamingCapability.h
# SmartDeviceLink/SDLVideoStreamingCapability.m
# SmartDeviceLink/SDLVideoStreamingCodec.h
# SmartDeviceLink/SDLVideoStreamingCodec.m
# SmartDeviceLink/SDLVideoStreamingFormat.h
# SmartDeviceLink/SDLVideoStreamingFormat.m
# SmartDeviceLink/SDLVideoStreamingProtocol.h
# SmartDeviceLink/SDLVideoStreamingProtocol.m
# SmartDeviceLinkTests/DevAPISpecs/SDLUploadFileOperationSpec.m
# SmartDeviceLinkTests/ProtocolSpecs/HeaderSpecs/SDLProtocolHeaderSpec.m
# SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolMessageSpec.m
# SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolSpec.m
# SmartDeviceLinkTests/ProtocolSpecs/SDLProtocolMessageDisassemblerSpec.m
# SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSystemCapabilityTypeSpec.m
# SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVideoStreamingCodecSpec.m
# SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVideoStreamingProtocolSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMICapabilitiesSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSystemCapabilitySpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVideoStreamingCapabilitySpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVideoStreamingFormatSpec.m
# SmartDeviceLink_Example/Classes/ProxyManager.m
* **Did not merge SMM changes due to upcoming overhaul**
Diffstat (limited to 'SmartDeviceLink-iOS.xcodeproj/project.xcworkspace')
| -rw-r--r-- | SmartDeviceLink-iOS.xcodeproj/project.xcworkspace/xcshareddata/SmartDeviceLink-iOS.xcscmblueprint | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/SmartDeviceLink-iOS.xcodeproj/project.xcworkspace/xcshareddata/SmartDeviceLink-iOS.xcscmblueprint b/SmartDeviceLink-iOS.xcodeproj/project.xcworkspace/xcshareddata/SmartDeviceLink-iOS.xcscmblueprint new file mode 100644 index 000000000..3d36d3962 --- /dev/null +++ b/SmartDeviceLink-iOS.xcodeproj/project.xcworkspace/xcshareddata/SmartDeviceLink-iOS.xcscmblueprint @@ -0,0 +1,30 @@ +{ + "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "66020812E25F835F7E461E1F36EFF9E212E74787", + "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : { + + }, + "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : { + "66020812E25F835F7E461E1F36EFF9E212E74787" : 9223372036854775807, + "56518C5F548896A9F8039D14FD50ECBB0A40BE1B" : 9223372036854775807 + }, + "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "E7549925-63B0-46D9-8801-13778848A065", + "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : { + "66020812E25F835F7E461E1F36EFF9E212E74787" : "sdl_ios\/", + "56518C5F548896A9F8039D14FD50ECBB0A40BE1B" : "sdl_ios\/bson_c_lib\/" + }, + "DVTSourceControlWorkspaceBlueprintNameKey" : "SmartDeviceLink-iOS", + "DVTSourceControlWorkspaceBlueprintVersion" : 204, + "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "SmartDeviceLink-iOS.xcodeproj", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [ + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/smartdevicelink\/bson_c_lib.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "56518C5F548896A9F8039D14FD50ECBB0A40BE1B" + }, + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/smartdevicelink\/sdl_ios.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "66020812E25F835F7E461E1F36EFF9E212E74787" + } + ] +}
\ No newline at end of file |