summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qkeymapper_p.h
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2011-01-31 11:37:19 (GMT)
committeraxis <qt-info@nokia.com>2011-01-31 11:37:19 (GMT)
commit5cd39cd8a70be4c22164fe060ad64a1d9108bf41 (patch)
tree4b072c7d4e4d717fe8f0977dd2108837ac71f7c3 /src/gui/kernel/qkeymapper_p.h
parentc40ae86025856225e74289249ecc509bf61dc9ba (diff)
parent9c132451acc7fbed1611fd3676cceb26e815f50d (diff)
downloadQt-5cd39cd8a70be4c22164fe060ad64a1d9108bf41.zip
Qt-5cd39cd8a70be4c22164fe060ad64a1d9108bf41.tar.gz
Qt-5cd39cd8a70be4c22164fe060ad64a1d9108bf41.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master
Diffstat (limited to 'src/gui/kernel/qkeymapper_p.h')
-rw-r--r--src/gui/kernel/qkeymapper_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qkeymapper_p.h b/src/gui/kernel/qkeymapper_p.h
index 98d8eec..ec2d849 100644
--- a/src/gui/kernel/qkeymapper_p.h
+++ b/src/gui/kernel/qkeymapper_p.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)
**