diff options
author | Muller, Alexander (A.) <amulle19@ford.com> | 2016-10-18 10:02:19 -0700 |
---|---|---|
committer | Muller, Alexander (A.) <amulle19@ford.com> | 2016-10-18 10:02:19 -0700 |
commit | 2a9d316bbce43764e14f6db23741f8ec2227aeef (patch) | |
tree | eb51b2ef186928bc7ec9fe238eed473d2e9f57e8 /SmartDeviceLink/Info.plist | |
parent | 81acf2c7fdf2431a47c6cd8a74f9a59f183a80b6 (diff) | |
parent | de01a9f7b3ed63f683604d3595568bacf5f54a5e (diff) | |
download | sdl_ios-2a9d316bbce43764e14f6db23741f8ec2227aeef.tar.gz |
Merge remote-tracking branch 'origin/develop' into feature/issue_419_iOS6_removal
* origin/develop: (23 commits)
Changed macro to look specifically for NS_STRING_ENUM
Improved enum macro to be less macro-y.
Added support for SDLNames on pre xcode-8/swift 3 builds
Revert SDLLockScreen.storyboard for Xcode 7 support.
Added missing generics
Fixed a file manager bug
Update to v4.3.0-rc.6
Improved error messaging if you connect to a head unit that doesn’t support files
Example app should only send command data on the first non-NONE HMI status, not any NONE
Fix a warning regarding format strings
Fix an issue where developers could attempt to send a file on a non-ready FileManager
If the file manager fails to start, we should continue (e.g. head units that do not support files)
Fixed a bug where the File Manager could fail to start without calling its start block
Update for 4.3.0-rc.5
Actually fix the podspec…probably
Fix Cocoapods podspec not including SmartDeviceLink.h
Fix podspec not using the new version number
Update for 4.3.0-rc.4
List public headers in podspec
Update the README to point to the smartdevicelink.com guides
...
# Conflicts:
# README.md
# SmartDeviceLink/SDLURLSession.m
# SmartDeviceLinkTests/UtilitiesSpecs/HTTP Connection/SDLURLSessionSpec.m
Diffstat (limited to 'SmartDeviceLink/Info.plist')
-rw-r--r-- | SmartDeviceLink/Info.plist | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/SmartDeviceLink/Info.plist b/SmartDeviceLink/Info.plist index 474c43472..b69e19868 100644 --- a/SmartDeviceLink/Info.plist +++ b/SmartDeviceLink/Info.plist @@ -15,7 +15,7 @@ <key>CFBundlePackageType</key> <string>FMWK</string> <key>CFBundleShortVersionString</key> - <string>4.3.0-rc.3</string> + <string>4.3.0-rc.6</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> |