summaryrefslogtreecommitdiff
path: root/util/s60pixelmetrics/pm_mapper.rss
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2011-01-19 11:40:49 +1000
committerMartin Jones <martin.jones@nokia.com>2011-01-19 11:40:49 +1000
commitebd4bc73c46c2962742a682b6a391fb68c482aec (patch)
tree3045a1af9e65ca6500437d4e90ccfd3637fb6976 /util/s60pixelmetrics/pm_mapper.rss
parent9c1e67d83f6175f339e6771be05ee60ba72426b3 (diff)
parent5d9738ed88da269033333299c16558882d346514 (diff)
downloadqt4-tools-ebd4bc73c46c2962742a682b6a391fb68c482aec.tar.gz
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
Diffstat (limited to 'util/s60pixelmetrics/pm_mapper.rss')
-rw-r--r--util/s60pixelmetrics/pm_mapper.rss2
1 files changed, 1 insertions, 1 deletions
diff --git a/util/s60pixelmetrics/pm_mapper.rss b/util/s60pixelmetrics/pm_mapper.rss
index d1983afd01..b7e6d3d6d1 100644
--- a/util/s60pixelmetrics/pm_mapper.rss
+++ b/util/s60pixelmetrics/pm_mapper.rss
@@ -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)
**