summaryrefslogtreecommitdiffstats
path: root/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@accenture.com>2011-03-08 16:04:05 (GMT)
committerShane Kearns <shane.kearns@accenture.com>2011-03-08 16:04:05 (GMT)
commitb6cc353adb0613ce41153181b4f08bb81b7acf68 (patch)
tree1c25cc922c513f8666470695a0d63b8a19e223a4 /src/plugins/bearer/networkmanager/qnetworkmanagerengine.h
parent5ef1fb5823a25cd4b27029701f7d707c82750acb (diff)
parent206b614f2e9623d792e6f398bf11765a44c272f5 (diff)
downloadQt-b6cc353adb0613ce41153181b4f08bb81b7acf68.zip
Qt-b6cc353adb0613ce41153181b4f08bb81b7acf68.tar.gz
Qt-b6cc353adb0613ce41153181b4f08bb81b7acf68.tar.bz2
Merge remote branch 'earth/master' into symbian-socket-engine
Conflicts: src/corelib/kernel/qcore_symbian_p.h src/network/kernel/qnetworkinterface_symbian.cpp
Diffstat (limited to 'src/plugins/bearer/networkmanager/qnetworkmanagerengine.h')
-rw-r--r--src/plugins/bearer/networkmanager/qnetworkmanagerengine.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h
index 78ebb0a..f9d1b9f 100644
--- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h
+++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.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)
**