diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-23 11:18:11 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-23 11:18:11 +0200 |
| commit | 084c5b3db794af1ce86b2b17455d9be5e64baebe (patch) | |
| tree | 46d29a7b89ff251c07b6fdd59c57e30f14baa64a /src/tools/qdoc/htmlgenerator.cpp | |
| parent | f4a0d6d2494d1dd41cd5b854a48b435120714d32 (diff) | |
| parent | 54987c6bf55b159d3ddb79461439700f6e0111f9 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp
Change-Id: I18a9d83fc14f4a9afdb1e40523ec51e3fa1d7754
Diffstat (limited to 'src/tools/qdoc/htmlgenerator.cpp')
| -rw-r--r-- | src/tools/qdoc/htmlgenerator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp index 7c861ff885..4cd2206f9c 100644 --- a/src/tools/qdoc/htmlgenerator.cpp +++ b/src/tools/qdoc/htmlgenerator.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the tools applications of the Qt Toolkit. ** |