diff options
| author | JackLivio <jack@livio.io> | 2020-07-23 14:56:38 -0400 |
|---|---|---|
| committer | JackLivio <jack@livio.io> | 2020-07-23 14:56:38 -0400 |
| commit | a6876caaba521b14e0b5a43b3c1fc7485fe36380 (patch) | |
| tree | e986553c647edf1085552fbc61ee293bf3f9c2b6 /src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_maneuver_request.h | |
| parent | 043464ea99873d1e397e184ec4494e25d1632626 (diff) | |
| parent | f2119f4b997b7ef8d3d8f771412e1e743c221713 (diff) | |
| download | sdl_core-a6876caaba521b14e0b5a43b3c1fc7485fe36380.tar.gz | |
Merge remote-tracking branch 'origin/develop' into feature/additional_submenus
# Conflicts:
# src/appMain/hmi_capabilities.json
# src/components/application_manager/include/application_manager/hmi_capabilities_impl.h
# src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc
# src/components/application_manager/src/hmi_capabilities_impl.cc
# src/components/include/application_manager/hmi_capabilities.h
Diffstat (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_maneuver_request.h')
0 files changed, 0 insertions, 0 deletions