delta/smartdevicelink/sdl_ios.git/SmartDeviceLink-iOS/SmartDeviceLink-iOS.xcodeproj/project.pbxproj, branch feature/enable_warnings github.com: smartdevicelink/sdl_ios.git Merge branch 'develop' into feature/enable_warnings 2015-04-23T18:34:16+00:00 Joel Fischer joel@livio.io 2015-04-23T18:34:16+00:00 e13cb34132f9d31fdc962b4fd58b97aa844a3740 Conflicts: SmartDeviceLink-iOS/SmartDeviceLink-iOS.xcodeproj/project.pbxproj 
Conflicts:
	SmartDeviceLink-iOS/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
Merge branch 'feature/vr_capitalization_best_practice' into develop 2015-04-14T18:15:46+00:00 Joel Fischer joel@livioradio.com 2015-04-14T18:09:06+00:00 96f5b6668d479dc81017a299744cf4df0266d6a7 Conflicts: SmartDeviceLink-iOS/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m SmartDeviceLink-iOS/SmartDeviceLink/SDLVrHelpItem.m SmartDeviceLink-iOS/SmartDeviceLink/SDLPerformInteractionSpec.m 
Conflicts:
	SmartDeviceLink-iOS/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
	SmartDeviceLink-iOS/SmartDeviceLink/SDLVrHelpItem.m
       SmartDeviceLink-iOS/SmartDeviceLink/SDLPerformInteractionSpec.m
Merge branch 'feature/hmiCapabilities_struct_4.0' into develop 2015-04-14T17:50:42+00:00 Joel Fischer joel@livioradio.com 2015-04-14T17:50:42+00:00 678a161a8e7e9ebe8e8159c9113d62058d8ced5c Conflicts: SmartDeviceLink-iOS/SmartDeviceLink-iOS.xcodeproj/project.pbxproj SmartDeviceLink-iOS/SmartDeviceLink/SDLNames.h 
Conflicts:
	SmartDeviceLink-iOS/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
	SmartDeviceLink-iOS/SmartDeviceLink/SDLNames.h
Merge branch 'feature/SendLocation_rpc_4.0' into develop 2015-04-14T15:41:28+00:00 Joel Fischer joel@livioradio.com 2015-04-14T15:41:28+00:00 23caa71078e9f0156f82cee545c8fe95743e65ea Conflicts: SmartDeviceLink-iOS/SmartDeviceLink-iOS.xcodeproj/project.pbxproj SmartDeviceLink-iOS/SmartDeviceLink/SDLFunctionID.m SmartDeviceLink-iOS/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m 
Conflicts:
	SmartDeviceLink-iOS/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
	SmartDeviceLink-iOS/SmartDeviceLink/SDLFunctionID.m
	SmartDeviceLink-iOS/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m
Merge branch 'feature/dialnumber_rpc_4.0' into develop 2015-04-14T14:20:44+00:00 Joel Fischer joel@livioradio.com 2015-04-14T14:20:44+00:00 7be7d749b40fadbb3980b888415feb33ba6d84c8 Conflicts: SmartDeviceLink-iOS/SmartDeviceLink-iOS.xcodeproj/project.pbxproj SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCRequestFactory.h 
Conflicts:
	SmartDeviceLink-iOS/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
	SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCRequestFactory.h
Add SDLDialNumber 4.0 RPC 2015-04-07T17:54:27+00:00 Joel Fischer joel@livioradio.com 2015-03-31T15:42:30+00:00 458e887f641f8c58e2c5d28bfea423ff0f396d31 Add SDLDialNumber RPC Request & Response Add DialNumber and Number Names Add RPCRequestFactory method Add tests for new request factory method Add tests for request & response Add tests for function ID changes 
Add SDLDialNumber RPC Request & Response

Add DialNumber and Number Names

Add RPCRequestFactory method

Add tests for new request factory method

Add tests for request & response

Add tests for function ID changes
Add SDLSendLocation RPC request and response 2015-04-07T17:41:02+00:00 Joel Fischer joel@livioradio.com 2015-04-07T17:40:56+00:00 99712ecf5401a564c2a28a197f8810ed7eeebe6f Add appropriate function IDs and names Add an RPCRequestFactory method for easy generation Add test for new RPCRequestFactory method Add tests for SDLSendLocation request / response Add function ID tests 
Add appropriate function IDs and names
Add an RPCRequestFactory method for easy generation
Add test for new RPCRequestFactory method
Add tests for SDLSendLocation request / response
Add function ID tests
Merge branch 'develop' into feature/SDLDebugToolConsole_own_file 2015-04-01T14:22:11+00:00 Joel Fischer joel@livioradio.com 2015-04-01T14:22:11+00:00 c0e72b471fb25f73c7b86178c63f2a91cb13c41f Conflicts: SmartDeviceLink-iOS/SmartDeviceLink-iOS.xcodeproj/project.pbxproj 
Conflicts:
	SmartDeviceLink-iOS/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
Add SDLHMICapabilities RPC struct 2015-03-31T21:07:46+00:00 Joel Fischer joel@livioradio.com 2015-03-31T21:07:46+00:00 87d26b074ed1b3cac90de08d9e15b2623c7abe69 Add appropriate constant strings Add to public header file Add test spec 
Add appropriate constant strings
Add to public header file
Add test spec
Merge branch 'develop' into feature/unit-tests 2015-03-30T18:34:12+00:00 Joel Fischer joel@livioradio.com 2015-03-30T18:07:57+00:00 a0c37513cbf8fc2eafbaa5e67ffba58a8352d5fa Conflicts: SmartDeviceLink-iOS/SmartDeviceLink-iOS.xcodeproj/project.pbxproj 
Conflicts:
	SmartDeviceLink-iOS/SmartDeviceLink-iOS.xcodeproj/project.pbxproj