summaryrefslogtreecommitdiff
path: root/src/script/bridge/qscriptvariant_p.h
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-01-17 14:15:12 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-01-17 18:18:06 +0100
commitd8232635209f0ed34e005384410a63fea018073e (patch)
tree61830d899b95e8d6d0479e740725e64b3d68f785 /src/script/bridge/qscriptvariant_p.h
parent1e470ee3fe914e811cfbfc104223bd230d084c74 (diff)
parentaaddb67d074dcf1965e6c07a7232dd688deac416 (diff)
downloadqtscript-d8232635209f0ed34e005384410a63fea018073e.tar.gz
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I3b5356983f0b86a4c5e339ebb1eae2c20e825b70
Diffstat (limited to 'src/script/bridge/qscriptvariant_p.h')
-rw-r--r--src/script/bridge/qscriptvariant_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/bridge/qscriptvariant_p.h b/src/script/bridge/qscriptvariant_p.h
index b0f374f..6c96430 100644
--- a/src/script/bridge/qscriptvariant_p.h
+++ b/src/script/bridge/qscriptvariant_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtScript module of the Qt Toolkit.