summaryrefslogtreecommitdiffstats
path: root/examples/tutorials/threads/hellothread
diff options
context:
space:
mode:
authorJoão Abecasis <joao.abecasis@nokia.com>2012-01-16 17:52:29 +0100
committerJoão Abecasis <joao.abecasis@nokia.com>2012-01-16 17:53:41 +0100
commit5b250d497fd798c476765b22a2906e1c0ff1e432 (patch)
treefd4215ca375cc2402e536bf670c2977cf64ae2ef /examples/tutorials/threads/hellothread
parent2c52e9a5c1d6ef6cbf4577430e14027375465c96 (diff)
parent7a0099183a1c107126bda3b59a47651aac612426 (diff)
Merge remote-tracking branch 'gerrit/master' into containers
Diffstat (limited to 'examples/tutorials/threads/hellothread')
-rw-r--r--[-rwxr-xr-x]examples/tutorials/threads/hellothread/hellothread.cpp2
-rw-r--r--[-rwxr-xr-x]examples/tutorials/threads/hellothread/hellothread.h2
-rw-r--r--[-rwxr-xr-x]examples/tutorials/threads/hellothread/main.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/tutorials/threads/hellothread/hellothread.cpp b/examples/tutorials/threads/hellothread/hellothread.cpp
index 01cd0f5b3c..932c10f119 100755..100644
--- a/examples/tutorials/threads/hellothread/hellothread.cpp
+++ b/examples/tutorials/threads/hellothread/hellothread.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/examples/tutorials/threads/hellothread/hellothread.h b/examples/tutorials/threads/hellothread/hellothread.h
index a3202c6396..35345697b4 100755..100644
--- a/examples/tutorials/threads/hellothread/hellothread.h
+++ b/examples/tutorials/threads/hellothread/hellothread.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/examples/tutorials/threads/hellothread/main.cpp b/examples/tutorials/threads/hellothread/main.cpp
index 9a548ea96a..1606c4302e 100755..100644
--- a/examples/tutorials/threads/hellothread/main.cpp
+++ b/examples/tutorials/threads/hellothread/main.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**