diff options
author | jacobkeeler <jacob.keeler@livioradio.com> | 2018-08-23 19:14:20 -0400 |
---|---|---|
committer | jacobkeeler <jacob.keeler@livioradio.com> | 2018-08-23 19:16:12 -0400 |
commit | 17e2a935233a781ba50f103cca5c094b5d846d6e (patch) | |
tree | 9d95686dd83cb08921cee83e163e5473ad43a89b /src/3rd_party/apache-log4cxx-0.10.0/src/main/cpp/threadcxx.cpp | |
parent | da112964563b41641f89dc9d67d6f76a20319b56 (diff) | |
parent | 2fc964516c75ad5da76895d767b3ae2f51ebe9d2 (diff) | |
download | sdl_core-17e2a935233a781ba50f103cca5c094b5d846d6e.tar.gz |
Merge branch 'develop' into fix/remove_set_iconfix/remove_set_icon
# Conflicts:
# src/components/application_manager/CMakeLists.txt
# src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_icon_request.h
# src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_icon_response.h
# src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_icon_request.h
# src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_icon_response.h
# src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_icon_request.cc
# src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_icon_request.cc
# src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_icon_response.cc
# src/components/application_manager/test/commands/hmi/dummy_hmi_commands_test.cc
# src/components/application_manager/test/commands/hmi/simple_requests_to_hmi_test.cc
Diffstat (limited to 'src/3rd_party/apache-log4cxx-0.10.0/src/main/cpp/threadcxx.cpp')
-rw-r--r-- | src/3rd_party/apache-log4cxx-0.10.0/src/main/cpp/threadcxx.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rd_party/apache-log4cxx-0.10.0/src/main/cpp/threadcxx.cpp b/src/3rd_party/apache-log4cxx-0.10.0/src/main/cpp/threadcxx.cpp index fffb43a66a..a40df3be94 100644 --- a/src/3rd_party/apache-log4cxx-0.10.0/src/main/cpp/threadcxx.cpp +++ b/src/3rd_party/apache-log4cxx-0.10.0/src/main/cpp/threadcxx.cpp @@ -13,6 +13,8 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * Note: This file has been modified from its original form. */ #include <log4cxx/logstring.h> |