summaryrefslogtreecommitdiffstats
path: root/config.tests/unix/shivavg/shivavg.cpp
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2011-01-26 14:17:08 +0100
committerJørgen Lind <jorgen.lind@nokia.com>2011-01-26 14:17:08 +0100
commitb0390e68893dd04076434695be5e676b87bc067c (patch)
tree60543fd8cf8c72f530a8865fa8fc2306bb52b9ba /config.tests/unix/shivavg/shivavg.cpp
parent537312d5dea24bd404666789119a5ad1bab04396 (diff)
parent57a4353c8e082dfc0f536a1e642e4a8df0e5b9c9 (diff)
Merge branch 'master' into lighthouse-master
Diffstat (limited to 'config.tests/unix/shivavg/shivavg.cpp')
-rw-r--r--config.tests/unix/shivavg/shivavg.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/config.tests/unix/shivavg/shivavg.cpp b/config.tests/unix/shivavg/shivavg.cpp
index eae6608ded..65c0feefd3 100644
--- a/config.tests/unix/shivavg/shivavg.cpp
+++ b/config.tests/unix/shivavg/shivavg.cpp
@@ -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)
**