diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-26 10:35:52 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-29 16:58:04 +0200 |
commit | fa12e9c1c3634696cf3e0754ab9c374456945efc (patch) | |
tree | 7729c6d1990dc2d9f4746c45e7fcae96d41a0128 /src/core/common | |
parent | 9d962bc9424c71a451d04741619c9597f3da8010 (diff) | |
parent | d044140246734b8851689f55197c03cfd29dec99 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I7094e85a7770303a2ae30baccbc484c04f33600e
Diffstat (limited to 'src/core/common')
-rw-r--r-- | src/core/common/qt_messages.cpp | 2 | ||||
-rw-r--r-- | src/core/common/qt_messages.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/common/qt_messages.cpp b/src/core/common/qt_messages.cpp index 43c29ad93..d64db69c9 100644 --- a/src/core/common/qt_messages.cpp +++ b/src/core/common/qt_messages.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// found in the LICENSE.Chromium file. // Get basic type definitions. #define IPC_MESSAGE_IMPL diff --git a/src/core/common/qt_messages.h b/src/core/common/qt_messages.h index 00efa485e..fae80186b 100644 --- a/src/core/common/qt_messages.h +++ b/src/core/common/qt_messages.h @@ -1,6 +1,6 @@ // Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// found in the LICENSE.Chromium file. // Multiply-included file, no traditional include guard. |