summaryrefslogtreecommitdiffstats
path: root/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@accenture.com>2011-02-07 17:20:33 (GMT)
committerShane Kearns <shane.kearns@accenture.com>2011-02-07 17:20:33 (GMT)
commit59a9938f91070ad3699fc6544848f0955ecf0bdd (patch)
tree99ad7312ddddf7233290115c7ea5daa3af0b83ec /tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h
parentb9307547c717606e08661cf474eeaf81cc0789e6 (diff)
parent44298c848ac254fe1942eb32eed7651dec5bf0e3 (diff)
downloadQt-59a9938f91070ad3699fc6544848f0955ecf0bdd.zip
Qt-59a9938f91070ad3699fc6544848f0955ecf0bdd.tar.gz
Qt-59a9938f91070ad3699fc6544848f0955ecf0bdd.tar.bz2
Merge remote branch 'qt/master' into symbian-socket-engine
Conflicts: src/network/access/qnetworkaccessmanager.cpp src/network/bearer/qnetworksession.cpp src/network/kernel/qnetworkproxy_symbian.cpp src/network/socket/qnativesocketengine_unix.cpp tests/auto/platformsocketengine/tst_platformsocketengine.cpp
Diffstat (limited to 'tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h')
-rw-r--r--tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h b/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h
index bcdbee9..d53d949 100644
--- a/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h
+++ b/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**