| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
# 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**
|
