summaryrefslogtreecommitdiffstats
path: root/config.profiles
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2011-04-07 23:59:05 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2011-04-07 23:59:05 (GMT)
commit99ba0cf26ddd0b45c809ae72868006eb94153545 (patch)
treea258ae81162b6e467864dde6d088df7ce37f816f /config.profiles
parent46082389f2a700a1f98826e0c575ab4e31059761 (diff)
parent45614d67061f31dce9791293b8fde516e39037d5 (diff)
downloadQt-99ba0cf26ddd0b45c809ae72868006eb94153545.zip
Qt-99ba0cf26ddd0b45c809ae72868006eb94153545.tar.gz
Qt-99ba0cf26ddd0b45c809ae72868006eb94153545.tar.bz2
Merge remote branch 'qa-review/master' into qa-staging-master
Diffstat (limited to 'config.profiles')
-rwxr-xr-xconfig.profiles/harmattan/tests/create_tests_xml2
-rw-r--r--config.profiles/harmattan/tests/maemo_tests.prf2
2 files changed, 2 insertions, 2 deletions
diff --git a/config.profiles/harmattan/tests/create_tests_xml b/config.profiles/harmattan/tests/create_tests_xml
index d6122bc..f872633 100755
--- a/config.profiles/harmattan/tests/create_tests_xml
+++ b/config.profiles/harmattan/tests/create_tests_xml
@@ -2,7 +2,7 @@
#############################################################################
##
-## 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)
##
diff --git a/config.profiles/harmattan/tests/maemo_tests.prf b/config.profiles/harmattan/tests/maemo_tests.prf
index 1b87781..5608cd7 100644
--- a/config.profiles/harmattan/tests/maemo_tests.prf
+++ b/config.profiles/harmattan/tests/maemo_tests.prf
@@ -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)
##