summaryrefslogtreecommitdiffstats
path: root/tools/activeqt/testcon/scripts/pythonscript.py
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2010-01-14 11:18:28 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2010-01-14 11:18:28 (GMT)
commit2ac0b4390164e7d92b53b0b0f55a82a9a054ee91 (patch)
treec57977b39f0a27961d1c9307f1a8bda40eb49695 /tools/activeqt/testcon/scripts/pythonscript.py
parenta299057a351b0aff2c961e920839451b67e50f4e (diff)
parent9baeb2fc297a7a30bb467ea0d1986c7fecea2e58 (diff)
downloadQt-2ac0b4390164e7d92b53b0b0f55a82a9a054ee91.zip
Qt-2ac0b4390164e7d92b53b0b0f55a82a9a054ee91.tar.gz
Qt-2ac0b4390164e7d92b53b0b0f55a82a9a054ee91.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'tools/activeqt/testcon/scripts/pythonscript.py')
-rw-r--r--tools/activeqt/testcon/scripts/pythonscript.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/activeqt/testcon/scripts/pythonscript.py b/tools/activeqt/testcon/scripts/pythonscript.py
index c428b97..fadd7d4 100644
--- a/tools/activeqt/testcon/scripts/pythonscript.py
+++ b/tools/activeqt/testcon/scripts/pythonscript.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
#############################################################################
##
-## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
## All rights reserved.
## Contact: Nokia Corporation (qt-info@nokia.com)
##