diff options
| author | Sho Amano <samano@xevo.com> | 2018-08-09 21:01:58 +0900 |
|---|---|---|
| committer | Sho Amano <samano@xevo.com> | 2018-08-09 22:32:13 +0900 |
| commit | f0cff660f098eea0a1d48979734516a4965c44c0 (patch) | |
| tree | 04893006d6f63ec2360ae8e1f2f4ceacff6c3c44 /SmartDeviceLink/SDLProxy.m | |
| parent | 114f9c69f68b0255331236585a338e49069dd62e (diff) | |
| parent | 3cb0f3be950203b8c0737ffe36debb2628d8d707 (diff) | |
| download | sdl_ios-f0cff660f098eea0a1d48979734516a4965c44c0.tar.gz | |
Merge branch 'develop' into feature/multiple_transports
Conflicts:
SmartDeviceLink-iOS.xcodeproj/project.pbxproj
SmartDeviceLink/SDLCarWindow.m
SmartDeviceLink/SDLLifecycleManager.m
SmartDeviceLink/SDLStreamingAudioLifecycleManager.h
SmartDeviceLink/SDLStreamingAudioLifecycleManager.m
SmartDeviceLink/SDLStreamingMediaManager.m
SmartDeviceLink/SDLStreamingVideoLifecycleManager.h
SmartDeviceLink/SDLStreamingVideoLifecycleManager.m
SmartDeviceLinkTests/DevAPISpecs/SDLStreamingVideoLifecycleManagerSpec.m
SmartDeviceLinkTests/SDLStreamingMediaLifecycleManagerSpec.m
SmartDeviceLinkTests/SDLStreamingVideoLifecycleManagerSpec.m
Diffstat (limited to 'SmartDeviceLink/SDLProxy.m')
| -rw-r--r-- | SmartDeviceLink/SDLProxy.m | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/SmartDeviceLink/SDLProxy.m b/SmartDeviceLink/SDLProxy.m index eeadbd06b..4d6b3ec1b 100644 --- a/SmartDeviceLink/SDLProxy.m +++ b/SmartDeviceLink/SDLProxy.m @@ -43,7 +43,7 @@ typedef NSString SDLVehicleMake; typedef void (^URLSessionTaskCompletionHandler)(NSData *data, NSURLResponse *response, NSError *error); typedef void (^URLSessionDownloadTaskCompletionHandler)(NSURL *location, NSURLResponse *response, NSError *error); -NSString *const SDLProxyVersion = @"6.0.0"; +NSString *const SDLProxyVersion = @"6.0.1"; const float StartSessionTime = 10.0; const float NotifyProxyClosedDelay = (float)0.1; const int PoliciesCorrelationId = 65535; |