diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:16:57 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:16:57 +0200 |
commit | 67d267aefca036db4cc47b5d52802484b5fdf284 (patch) | |
tree | 931ae84c0dbc31043f7b3911e0110b12febcd4a2 | |
parent | ca7d7a458b2dda46b69358255b1b2c0e587a7290 (diff) | |
parent | 89a3330783ba1b16fca2a27a99e090a458fbd0a9 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Id075e7cf92b8cfe699f81859c4b1174c045757cd
-rw-r--r-- | doc/src/qtwebkit-examples.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/qtwebkit-examples.qdoc b/doc/src/qtwebkit-examples.qdoc index e2417b0..24b2eb7 100644 --- a/doc/src/qtwebkit-examples.qdoc +++ b/doc/src/qtwebkit-examples.qdoc @@ -1,4 +1,4 @@ -**************************************************************************** +/**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal @@ -61,7 +61,7 @@ /*! \group webkit-qmlexamples - \title Qt Webkit Examples + \title Qt WebKit Examples List \brief QML examples demonstrating Webkit features \ingroup all-examples |