summaryrefslogtreecommitdiffstats
path: root/src/network/bearer
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-09 16:04:21 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-09 16:04:21 (GMT)
commitbb7b62f3cb7aca178a9e5e65263d0a4a8d40829c (patch)
tree063b724a9b17c814c49b2ead876d795e0f559db7 /src/network/bearer
parent1e9b107b082282d4aadcffedcd67cb7e5e56aef8 (diff)
parentdc6b5702e0c488bf51ca029290eb65604bfb1dd5 (diff)
downloadQt-bb7b62f3cb7aca178a9e5e65263d0a4a8d40829c.zip
Qt-bb7b62f3cb7aca178a9e5e65263d0a4a8d40829c.tar.gz
Qt-bb7b62f3cb7aca178a9e5e65263d0a4a8d40829c.tar.bz2
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/network/bearer')
-rw-r--r--src/network/bearer/qsharednetworksession.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/bearer/qsharednetworksession.cpp b/src/network/bearer/qsharednetworksession.cpp
index 51b3a32..28ca173 100644
--- a/src/network/bearer/qsharednetworksession.cpp
+++ b/src/network/bearer/qsharednetworksession.cpp
@@ -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)
**