summaryrefslogtreecommitdiffstats
path: root/src/network/kernel
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2009-05-20 12:45:16 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-05-20 12:45:16 (GMT)
commit7b49dee3036603a99e8367f715d6ebde933ab6ba (patch)
tree1c0d56f5e487e76c5470aeb9b62f2b033f25836d /src/network/kernel
parentc6f8b600cb1635bef425b3d2232213fb41ea96bd (diff)
parentfc6e0155cc3fa9beb3b48704a1effe87a74c2779 (diff)
downloadQt-7b49dee3036603a99e8367f715d6ebde933ab6ba.zip
Qt-7b49dee3036603a99e8367f715d6ebde933ab6ba.tar.gz
Qt-7b49dee3036603a99e8367f715d6ebde933ab6ba.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/network/kernel')
-rw-r--r--src/network/kernel/qnetworkinterface.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/kernel/qnetworkinterface.cpp b/src/network/kernel/qnetworkinterface.cpp
index 670745b..960999e 100644
--- a/src/network/kernel/qnetworkinterface.cpp
+++ b/src/network/kernel/qnetworkinterface.cpp
@@ -397,7 +397,7 @@ QNetworkInterface::~QNetworkInterface()
}
/*!
- Creates a copy of the the QNetworkInterface object contained in \a
+ Creates a copy of the QNetworkInterface object contained in \a
other.
*/
QNetworkInterface::QNetworkInterface(const QNetworkInterface &other)