diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-23 22:12:54 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-23 22:12:54 +0100 |
| commit | 7df08a8b63c8fc861a5e927eabf2405e1a2a01e1 (patch) | |
| tree | 495ff2934465b02b01fc2ff694687344c909bf62 /examples/tools/customtype | |
| parent | 06e4b1cff4c469d2fc3afbfe7a6b1954fedc90ff (diff) | |
| parent | c608ec825410a9287f544a2ae3ce8154424e767d (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'examples/tools/customtype')
| -rw-r--r-- | examples/tools/customtype/main.cpp | 2 | ||||
| -rw-r--r-- | examples/tools/customtype/message.cpp | 2 | ||||
| -rw-r--r-- | examples/tools/customtype/message.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/tools/customtype/main.cpp b/examples/tools/customtype/main.cpp index a512e1a01d..8e97d3db96 100644 --- a/examples/tools/customtype/main.cpp +++ b/examples/tools/customtype/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/examples/tools/customtype/message.cpp b/examples/tools/customtype/message.cpp index 6a1a978135..c470ab116e 100644 --- a/examples/tools/customtype/message.cpp +++ b/examples/tools/customtype/message.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/examples/tools/customtype/message.h b/examples/tools/customtype/message.h index 77cfba67f0..cdc4e39caf 100644 --- a/examples/tools/customtype/message.h +++ b/examples/tools/customtype/message.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. |