summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-05-13 10:42:41 +1000
committerJason McDonald <jason.mcdonald@nokia.com>2011-05-13 10:42:41 +1000
commitdd1a7a6379181765c3e8585f8fd12fb69f67c965 (patch)
treeeaac978146f567fbb60f8a795b3311cde2c86e68 /doc/src/snippets/code
parentd9119535a2e3fcb977998ab1f7006f8a15b5a140 (diff)
parentbef27c48ef49b6a5b511da47ab0d78fc254bcd07 (diff)
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
Diffstat (limited to 'doc/src/snippets/code')
-rw-r--r--doc/src/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/doc/src/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp b/doc/src/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp
index 8bd65208cb5..6bf6c895f6f 100644
--- a/doc/src/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp
+++ b/doc/src/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp
@@ -1,8 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2011 Klarälvdalens Datakonsult AB,
-** a KDAB Group company, info@kdab.com,
-** author Stephen Kelly <stephen.kelly@kdab.com>
+** Copyright (C) 2011 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly <stephen.kelly@kdab.com>
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**