diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2017-07-12 15:09:46 -0400 |
|---|---|---|
| committer | Joel Fischer <joeljfischer@gmail.com> | 2017-07-12 15:09:46 -0400 |
| commit | 1895b2ce4f63c35eedc9ed454408887fb448f613 (patch) | |
| tree | fabdb43016c5f1bfc3c5e0e7404458039ac3b77c /SmartDeviceLink-iOS.podspec | |
| parent | 044a93c17635f06b3903990ac7407759a62b3835 (diff) | |
| parent | 0dfbf8f25bef1e0e03696ace61f90455f393df2f (diff) | |
| download | sdl_ios-1895b2ce4f63c35eedc9ed454408887fb448f613.tar.gz | |
Merge branch 'feature/611_system_capabilities_query_rpc' into feature/611_system_capabilities_query_rpc_5.0.0
# Conflicts:
# SmartDeviceLink-iOS.xcodeproj/project.pbxproj
# SmartDeviceLink/SDLFunctionID.m
# SmartDeviceLink/SDLHeadLampStatus.h
# SmartDeviceLink/SDLNames.h
Diffstat (limited to 'SmartDeviceLink-iOS.podspec')
0 files changed, 0 insertions, 0 deletions