diff options
| author | NicoleYarroch <nicole@livio.io> | 2019-08-07 16:13:04 -0400 |
|---|---|---|
| committer | NicoleYarroch <nicole@livio.io> | 2019-08-07 16:13:04 -0400 |
| commit | 64bc688c783ad61e962dd8690641cb9211461b10 (patch) | |
| tree | 85993183ab28878face9140f15e6539266e16c37 /SmartDeviceLink/SDLRPCFunctionNames.h | |
| parent | 9477e591f8c386793fa6e06ab570c4efce157a5a (diff) | |
| parent | f43c7f46c0e535a322afbd76afb312bfa1fdeedc (diff) | |
| download | sdl_ios-64bc688c783ad61e962dd8690641cb9211461b10.tar.gz | |
Merge branch 'develop' into feature/issue_1055_cancel_interaction_RPC
# Conflicts:
# Example Apps/Example ObjC/AlertManager.m
# Example Apps/Example Swift/AlertManager.swift
# SmartDeviceLink/SDLAlert.h
# SmartDeviceLink/SDLAlert.m
# SmartDeviceLink/SDLScreenManager.h
# SmartDeviceLink/SDLScreenManager.m
# SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m
Diffstat (limited to 'SmartDeviceLink/SDLRPCFunctionNames.h')
| -rw-r--r-- | SmartDeviceLink/SDLRPCFunctionNames.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/SmartDeviceLink/SDLRPCFunctionNames.h b/SmartDeviceLink/SDLRPCFunctionNames.h index 9d42e5da9..0a19cd58c 100644 --- a/SmartDeviceLink/SDLRPCFunctionNames.h +++ b/SmartDeviceLink/SDLRPCFunctionNames.h @@ -82,6 +82,7 @@ extern SDLRPCFunctionName const SDLRPCFunctionNameSetGlobalProperties; extern SDLRPCFunctionName const SDLRPCFunctionNameSetInteriorVehicleData; extern SDLRPCFunctionName const SDLRPCFunctionNameSetMediaClockTimer; extern SDLRPCFunctionName const SDLRPCFunctionNameShow; +extern SDLRPCFunctionName const SDLRPCFunctionNameShowAppMenu; extern SDLRPCFunctionName const SDLRPCFunctionNameShowConstantTBT; extern SDLRPCFunctionName const SDLRPCFunctionNameSlider; extern SDLRPCFunctionName const SDLRPCFunctionNameSpeak; |