diff options
| author | Andrew Stanley-Jones <andrew.stanley-jones@nokia.com> | 2010-11-10 10:59:58 +1000 |
|---|---|---|
| committer | Andrew Stanley-Jones <andrew.stanley-jones@nokia.com> | 2010-11-10 10:59:58 +1000 |
| commit | e0afe41b78dd301ca5939dd257bd3e73cb202c5b (patch) | |
| tree | d0f27a47964e0c587888277a2d40780f6206e170 /examples/sysinfo/dialog.cpp | |
| parent | 678a13fc1199673fbfbf002e54f6eb0f6d05df82 (diff) | |
| parent | 1d9489626cb79197031ce93c8b85b988ce58726f (diff) | |
Merge remote branch 'origin/1.1' into master-from-1.1
Conflicts:
common.pri
doc/src/qtmobility.qdocconf
features/mobility.prf.template
plugins/declarative/multimedia/qdeclarativemediabase.cpp
qtmobility.pro
src/global/qmobilityglobal.h
src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.cpp
src/s60installs/s60installs.pro
src/sensors/qgyroscope.h
src/systeminfo/linux/qsysteminfo_linux.cpp
src/systeminfo/linux/qsysteminfodbushelper_p.h
src/systeminfo/qsysteminfo_linux_common.cpp
Diffstat (limited to 'examples/sysinfo/dialog.cpp')
| -rw-r--r-- | examples/sysinfo/dialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/sysinfo/dialog.cpp b/examples/sysinfo/dialog.cpp index 1d041c9759..aec06110e6 100644 --- a/examples/sysinfo/dialog.cpp +++ b/examples/sysinfo/dialog.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Qt Mobility Components. +** This file is part of the examples of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: |