|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
# Conflicts:
# SmartDeviceLink/SDLAbstractProtocol.h
# SmartDeviceLink/SDLAbstractTransport.h
# SmartDeviceLink/SDLAddCommand.h
# SmartDeviceLink/SDLAddSubMenu.h
# SmartDeviceLink/SDLAlert.h
# SmartDeviceLink/SDLAlertManeuver.h
# SmartDeviceLink/SDLAlertResponse.h
# SmartDeviceLink/SDLBodyInformation.h
# SmartDeviceLink/SDLChoice.h
# SmartDeviceLink/SDLDIDResult.h
# SmartDeviceLink/SDLDeviceInfo.h
# SmartDeviceLink/SDLDisplayCapabilities.h
# SmartDeviceLink/SDLGetDTCs.h
# SmartDeviceLink/SDLGetVehicleData.h
# SmartDeviceLink/SDLGetVehicleDataResponse.h
# SmartDeviceLink/SDLGetWaypointsResponse.h
# SmartDeviceLink/SDLHeadLampStatus.h
# SmartDeviceLink/SDLIAPSession.h
# SmartDeviceLink/SDLIAPTransport.h
# SmartDeviceLink/SDLIAPTransport.m
# SmartDeviceLink/SDLImageField.h
# SmartDeviceLink/SDLKeyboardProperties.h
# SmartDeviceLink/SDLListFilesResponse.h
# SmartDeviceLink/SDLLocationDetails.h
# SmartDeviceLink/SDLMenuParams.h
# SmartDeviceLink/SDLObjectWithPriority.h
# SmartDeviceLink/SDLOnButtonEvent.h
# SmartDeviceLink/SDLOnButtonPress.h
# SmartDeviceLink/SDLOnEncodedSyncPData.h
# SmartDeviceLink/SDLOnKeyboardInput.h
# SmartDeviceLink/SDLOnSyncPData.h
# SmartDeviceLink/SDLOnSystemRequest.h
# SmartDeviceLink/SDLOnVehicleData.h
# SmartDeviceLink/SDLPerformAudioPassThru.h
# SmartDeviceLink/SDLPerformInteraction.h
# SmartDeviceLink/SDLPerformInteractionResponse.h
# SmartDeviceLink/SDLProtocol.m
# SmartDeviceLink/SDLProtocolMessage.h
# SmartDeviceLink/SDLProtocolMessage.m
# SmartDeviceLink/SDLProtocolMessageAssembler.h
# SmartDeviceLink/SDLProtocolReceivedMessageRouter.h
# SmartDeviceLink/SDLProtocolReceivedMessageRouter.m
# SmartDeviceLink/SDLProxy.h
# SmartDeviceLink/SDLProxy.m
# SmartDeviceLink/SDLPutFile.h
# SmartDeviceLink/SDLRPCMessage.h
# SmartDeviceLink/SDLRPCPayload.h
# SmartDeviceLink/SDLRPCResponse.h
# SmartDeviceLink/SDLReadDIDResponse.h
# SmartDeviceLink/SDLRegisterAppInterface.h
# SmartDeviceLink/SDLRegisterAppInterfaceResponse.h
# SmartDeviceLink/SDLScreenParams.h
# SmartDeviceLink/SDLScrollableMessage.h
# SmartDeviceLink/SDLSetDisplayLayoutResponse.h
# SmartDeviceLink/SDLSetGlobalProperties.h
# SmartDeviceLink/SDLSetMediaClockTimer.h
# SmartDeviceLink/SDLShow.h
# SmartDeviceLink/SDLShowConstantTBT.h
# SmartDeviceLink/SDLSlider.h
# SmartDeviceLink/SDLSliderResponse.h
# SmartDeviceLink/SDLSoftButton.h
# SmartDeviceLink/SDLSubscribeVehicleData.h
# SmartDeviceLink/SDLSubscribeVehicleDataResponse.h
# SmartDeviceLink/SDLSystemRequest.h
# SmartDeviceLink/SDLTimer.h
# SmartDeviceLink/SDLTimer.m
# SmartDeviceLink/SDLTurn.h
# SmartDeviceLink/SDLUnsubscribeVehicleData.h
# SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h
# SmartDeviceLink/SDLUpdateTurnList.h
# SmartDeviceLink/SDLVehicleType.h
# SmartDeviceLink/SDLVrHelpItem.h
|