summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2009-06-16 12:33:23 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-06-16 12:33:23 (GMT)
commit9cb67d3db32423b4e624a8c1a7451a52ba242f54 (patch)
treec4a68f1766a4e22e021eca8ab825941e5f8990b7
parent714a62490fd30986dc86559e6f14194a34b3a5bc (diff)
downloadQt-9cb67d3db32423b4e624a8c1a7451a52ba242f54.zip
Qt-9cb67d3db32423b4e624a8c1a7451a52ba242f54.tar.gz
Qt-9cb67d3db32423b4e624a8c1a7451a52ba242f54.tar.bz2
Compile after botched merge
-rw-r--r--src/gui/kernel/qwidget.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 6e12540..185738e 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -1,4 +1,4 @@
-****************************************************************************
+/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information (qt-info@nokia.com)