diff options
| author | Muller, Alexander (A.) <alex.silvio.muller@gmail.com> | 2017-03-17 10:23:44 -0700 |
|---|---|---|
| committer | Muller, Alexander (A.) <alex.silvio.muller@gmail.com> | 2017-03-17 10:23:44 -0700 |
| commit | dce1461e5bc87d14d1aebc03a8c31b87b9a975b2 (patch) | |
| tree | 784fe70a25e1c1c8893c8ca0384d437fc0f299c6 /README.md | |
| parent | bac6fd668742e4385c7335657b2823d5995e5cf0 (diff) | |
| parent | e58656da8322a371f5e604d0f1ae870e493543b0 (diff) | |
| download | sdl_ios-dce1461e5bc87d14d1aebc03a8c31b87b9a975b2.tar.gz | |
Merge remote-tracking branch 'origin/develop' into feature/issue_545_redesign_logging
* origin/develop:
Updated appType to return when setting to nil with default value.
Changed NSString category name from Enum to SDLEnum.
Added convenience isEqualToEnum function.
Update README.md
# Conflicts:
# SmartDeviceLink-iOS.xcodeproj/project.pbxproj
# SmartDeviceLink/SDLEnum.h
# SmartDeviceLink/SDLProxy.m
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -16,7 +16,8 @@ * The [Core](https://github.com/smartdevicelink/sdl_core) component is the software which Vehicle Manufacturers (OEMs) implement in their vehicle head units. Integrating this component into their head unit and HMI based on a set of guidelines and templates enables access to various smartphone applications. * The optional [SDL Server](https://github.com/smartdevicelink/sdl_server) can be used by Vehicle OEMs to update application policies and gather usage information for connected applications. * The [iOS](https://github.com/smartdevicelink/sdl_ios) and [Android](https://github.com/smartdevicelink/sdl_android) libraries are implemented by app developers into their applications to enable command and control via the connected head unit. -* To suggest new features to SDL, including the iOS library, go to the [SDL Evolution](https://github.com/smartdevicelink/sdl_evolution) github project +* To suggest new features to SDL, including the iOS library, go to the [SDL Evolution](https://github.com/smartdevicelink/sdl_evolution) github project. +* To understand if a contribution should be entered as an iOS Pull Request or Issue, or an SDL Evolution Proposal, please reference [this document](https://github.com/smartdevicelink/sdl_evolution/blob/master/proposals_versus_issues.md). <a href="http://www.youtube.com/watch?feature=player_embedded&v=AzdQdSCS24M" target="_blank"><img src="http://i.imgur.com/nm8UujD.png?1" alt="SmartDeviceLink" border="10" /></a> |