diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-20 19:45:18 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-20 19:45:40 +0100 |
| commit | c52cf2ad2d41b2878f1d19a5ffbfe0d0ee091f3f (patch) | |
| tree | 40cc6472ba9e4e402b41120f9e584565e9c8df45 /src/script/bridge/qscriptactivationobject_p.h | |
| parent | 3b26f6f6643978c9d041a6267dc88e2a59ced763 (diff) | |
| parent | 7a09d123cb29129419dea33c4e2ef0217b339a44 (diff) | |
| download | qtscript-c52cf2ad2d41b2878f1d19a5ffbfe0d0ee091f3f.tar.gz | |
Merge branch 'stable' into release
Change-Id: I7178c6375a3c2a555d9eb88922082d3af22a3f20
Diffstat (limited to 'src/script/bridge/qscriptactivationobject_p.h')
| -rw-r--r-- | src/script/bridge/qscriptactivationobject_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/bridge/qscriptactivationobject_p.h b/src/script/bridge/qscriptactivationobject_p.h index 430560f..9148506 100644 --- a/src/script/bridge/qscriptactivationobject_p.h +++ b/src/script/bridge/qscriptactivationobject_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. |