summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code/src_script_qscriptcontext.cpp
diff options
context:
space:
mode:
authoraavit <qt-info@nokia.com>2011-01-18 11:44:56 (GMT)
committeraavit <qt-info@nokia.com>2011-01-18 11:44:56 (GMT)
commitbef9617c1f0a1c5f2c4aa9bc9e9ab4334a6b0f81 (patch)
treea44006d06de4c7aea7e1ea792261f001ebd8d373 /doc/src/snippets/code/src_script_qscriptcontext.cpp
parentce089742eb9caed768beed0ae68b2623a9cdf2ca (diff)
parent46ba213883cf46871ef539ef4d2304064b671175 (diff)
downloadQt-bef9617c1f0a1c5f2c4aa9bc9e9ab4334a6b0f81.zip
Qt-bef9617c1f0a1c5f2c4aa9bc9e9ab4334a6b0f81.tar.gz
Qt-bef9617c1f0a1c5f2c4aa9bc9e9ab4334a6b0f81.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptcontext.cpp')
-rw-r--r--doc/src/snippets/code/src_script_qscriptcontext.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/snippets/code/src_script_qscriptcontext.cpp b/doc/src/snippets/code/src_script_qscriptcontext.cpp
index dfb8ac2..09c58cf 100644
--- a/doc/src/snippets/code/src_script_qscriptcontext.cpp
+++ b/doc/src/snippets/code/src_script_qscriptcontext.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)
**