summaryrefslogtreecommitdiffstats
path: root/demos/embedded/fluidlauncher/pictureflow.cpp
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-09-04 11:35:17 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-09-04 11:35:17 (GMT)
commitb576bca55f88ed749a0a2b409be986dbf6b96b0a (patch)
tree69789d636ff2328cfc4101851f9a28de4a2a825e /demos/embedded/fluidlauncher/pictureflow.cpp
parent0b8062f5fbd7622a528ce61b767d00fbcdfc74a0 (diff)
parent9d85dcf10d580a45c261e3e1a8d8df7d41cb9437 (diff)
downloadQt-b576bca55f88ed749a0a2b409be986dbf6b96b0a.zip
Qt-b576bca55f88ed749a0a2b409be986dbf6b96b0a.tar.gz
Qt-b576bca55f88ed749a0a2b409be986dbf6b96b0a.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'demos/embedded/fluidlauncher/pictureflow.cpp')
-rw-r--r--demos/embedded/fluidlauncher/pictureflow.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/demos/embedded/fluidlauncher/pictureflow.cpp b/demos/embedded/fluidlauncher/pictureflow.cpp
index 9eeaa26..293ef99 100644
--- a/demos/embedded/fluidlauncher/pictureflow.cpp
+++ b/demos/embedded/fluidlauncher/pictureflow.cpp
@@ -3,10 +3,6 @@
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** This is a version of the Pictureflow animated image show widget modified by Nokia.
-**
** This file is part of the ActiveQt framework of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$