diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2017-08-18 10:35:14 -0400 |
|---|---|---|
| committer | Joel Fischer <joeljfischer@gmail.com> | 2017-08-18 10:35:14 -0400 |
| commit | 493b36f11b2b618bd9a3c86ff4a57e8cf096b37c (patch) | |
| tree | f8b97dfda0fcd30a3b123c03eab83e6bd3fdd948 /SmartDeviceLink/SDLIgnitionStatus.m | |
| parent | e516eabe852c637bb2499a96ce14278f9c70f83c (diff) | |
| parent | e6848c716f3b0768ded3c298c5c67a5ecbd8a855 (diff) | |
| download | sdl_ios-493b36f11b2b618bd9a3c86ff4a57e8cf096b37c.tar.gz | |
Merge branch 'release/5.0.0' into feature/SDL_0075_OEM_specific_HID_support_5.0
# Conflicts:
# SmartDeviceLink-iOS.podspec
# SmartDeviceLink-iOS.xcodeproj/project.pbxproj
# SmartDeviceLink.podspec
Diffstat (limited to 'SmartDeviceLink/SDLIgnitionStatus.m')
0 files changed, 0 insertions, 0 deletions