diff options
| author | Muller, Alexander (A.) <amulle19@ford.com> | 2016-09-23 09:16:26 -0700 |
|---|---|---|
| committer | Muller, Alexander (A.) <amulle19@ford.com> | 2016-09-23 09:16:26 -0700 |
| commit | 1ce65edeba09f9f455487de15d35f0b4b18f84e1 (patch) | |
| tree | 8943a01be6f7208c7b2d4e19250a7e69d9604eb4 /SmartDeviceLink | |
| parent | aac4fe7ec20230958f39425a3f340324727383da (diff) | |
| parent | 30f9b8364448a52bb9a206223493c9586fce65fe (diff) | |
| download | sdl_ios-1ce65edeba09f9f455487de15d35f0b4b18f84e1.tar.gz | |
Merge branch 'develop' of https://github.com/smartdevicelink/sdl_ios into feature/issue_3_constant_names
* 'develop' of https://github.com/smartdevicelink/sdl_ios:
Update public imports for organization and to remove a duplicate
A few more updates to travis scripts
Try better Travis CI build formatting
Diffstat (limited to 'SmartDeviceLink')
| -rw-r--r-- | SmartDeviceLink/SmartDeviceLink.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/SmartDeviceLink/SmartDeviceLink.h b/SmartDeviceLink/SmartDeviceLink.h index 55d8c2eb9..176bee596 100644 --- a/SmartDeviceLink/SmartDeviceLink.h +++ b/SmartDeviceLink/SmartDeviceLink.h @@ -15,12 +15,12 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[]; /***** Proxy *****/ #import "SDLProxy.h" #import "SDLProxyFactory.h" -#import "SDLProxyFactory.h" #import "SDLProxyListener.h" #import "SDLSecurityType.h" #import "SDLStreamingMediaManager.h" #import "SDLTTSChunkFactory.h" #import "SDLTouchManager.h" +#import "SDLTouchManagerDelegate.h" /***** Debug *****/ #import "SDLConsoleController.h" @@ -39,7 +39,6 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[]; #import "SDLAbstractProtocol.h" #import "SDLProtocol.h" #import "SDLProtocolListener.h" -#import "SDLTouchManagerDelegate.h" // Header #import "SDLProtocolHeader.h" |