delta/smartdevicelink/sdl_ios.git/SmartDeviceLink_Example, branch bug/podspec_fix github.com: smartdevicelink/sdl_ios.git Merge branch 'release/5.0.0' into feature/streaming_media_manager 2017-08-16T15:01:19+00:00 Joel Fischer joeljfischer@gmail.com 2017-08-16T15:01:19+00:00 963d47d401299ee062111d603efc4064192ae080 # Conflicts: # SmartDeviceLink-iOS.xcodeproj/project.pbxproj 
# Conflicts:
#	SmartDeviceLink-iOS.xcodeproj/project.pbxproj
Merge branch 'release/5.0.0' into feature/streaming_media_manager 2017-08-01T19:30:04+00:00 Joel Fischer joeljfischer@gmail.com 2017-08-01T19:30:04+00:00 17c0e6af14b49b35012f222fb3b0910a98ad45d3 # Conflicts: # SmartDeviceLink-iOS.podspec # SmartDeviceLink-iOS.xcodeproj/project.pbxproj # SmartDeviceLink/SDLStreamingMediaManager.m 
# Conflicts:
#	SmartDeviceLink-iOS.podspec
#	SmartDeviceLink-iOS.xcodeproj/project.pbxproj
#	SmartDeviceLink/SDLStreamingMediaManager.m
Merge branch 'release/5.0.0' into feature/issue_536_input_stream_file_manager 2017-07-31T14:03:47+00:00 NicoleYarroch nicole@livio.io 2017-07-31T14:03:47+00:00 591c7ccaf9f183a90d35154ebdfb306bef63bec5 






Merge branch 'jamescs-feature/implement_SDL_0080_multisession_protocol' into release/5.0.0
2017-07-28T18:43:52+00:00

Joel Fischer
joeljfischer@gmail.com

2017-07-28T18:43:47+00:00

21e3334e53e5e102daa81acaa0098d2e4d503d2d

# Conflicts:
#	SmartDeviceLink/SDLIAPTransport.m





# Conflicts:
#	SmartDeviceLink/SDLIAPTransport.m







Added multisession protocol to info.plist for example app
2017-07-28T14:52:55+00:00

James Sokoll
j@sokoll.co

2017-07-28T14:52:55+00:00

d49beba0316cf76053c6879303161f54ac039492












Fix system capability response handlers not firing
2017-07-13T19:29:44+00:00

Joel Fischer
joeljfischer@gmail.com

2017-07-13T19:22:55+00:00

0a59ede76b4698d8bed8dd5bf9654c471ee32a56

* Fix some headers not being public

# Conflicts:
#	SmartDeviceLink-iOS.xcodeproj/project.pbxproj





* Fix some headers not being public

# Conflicts:
#	SmartDeviceLink-iOS.xcodeproj/project.pbxproj







Merge branch 'develop' into release/5.0.0
2017-07-10T18:05:22+00:00

Joel Fischer
joeljfischer@gmail.com

2017-07-10T18:05:22+00:00

044a93c17635f06b3903990ac7407759a62b3835












Update for v4.6.1
2017-07-10T17:12:04+00:00

Joel Fischer
joeljfischer@gmail.com

2017-07-10T17:12:04+00:00

4d0f991f317ba06dd5c48389b7d030f979a625b2












Merge branch 'master' into release/5.0.0
2017-07-10T15:23:00+00:00

Joel Fischer
joeljfischer@gmail.com

2017-07-10T15:22:55+00:00

2a17605af1d29aa3659b976d01ac68a244669040

# Conflicts:
#	SmartDeviceLink-iOS.xcodeproj/project.pbxproj
#	SmartDeviceLink_Example/Classes/ProxyManager.m





# Conflicts:
#	SmartDeviceLink-iOS.xcodeproj/project.pbxproj
#	SmartDeviceLink_Example/Classes/ProxyManager.m







[Example App] Fix a compiler error
2017-07-03T17:35:18+00:00

Joel Fischer
joeljfischer@gmail.com

2017-07-03T17:35:18+00:00

3d4f38fa59ca64b5ed8abd7a044fcca08aaecf4c