diff options
| author | JackLivio <jack@livio.io> | 2018-08-29 14:08:41 -0400 |
|---|---|---|
| committer | JackLivio <jack@livio.io> | 2018-08-29 14:08:41 -0400 |
| commit | cee3ba5cec980dcee4cc37af71bd09dc306d3867 (patch) | |
| tree | 3f22a7132d77dde142019231bf10ab2e3be1f5dd /src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener.h | |
| parent | 90db9ca480eabeaf85ec77626b1bf10fa491270d (diff) | |
| parent | 09e4e684708ad5ab2544c72745516e9fe481ba0b (diff) | |
| download | sdl_core-cee3ba5cec980dcee4cc37af71bd09dc306d3867.tar.gz | |
Merge remote-tracking branch 'origin/develop' into feature/boost_filesystem_implementation
# Conflicts:
# src/3rd_party/CMakeLists.txt
# src/components/utils/CMakeLists.txt
Diffstat (limited to 'src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener.h')
| -rw-r--r-- | src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener.h b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener.h index 07938224d6..4606bac2d4 100644 --- a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener.h +++ b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener.h @@ -2,9 +2,6 @@ * Copyright (c) 2014, Ford Motor Company * All rights reserved. * - * Copyright (c) 2018 Xevo Inc. - * All rights reserved. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * @@ -16,7 +13,7 @@ * disclaimer in the documentation and/or other materials provided with the * distribution. * - * Neither the name of the copyright holders nor the names of its contributors + * Neither the name of the Ford Motor Company nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * |