diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-06-30 04:42:16 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-06-30 04:42:16 (GMT) |
| commit | c9135a429441cb00720866604b79d6613000f7c5 (patch) | |
| tree | b338494396f892094afa933d8f10475215752c0a /src/declarative/qml/parser/qmljsnodepool_p.h | |
| parent | dba327eec1a308e61c2bd21941ba982fb9283827 (diff) | |
| parent | a77153a64e8559b21a7e6ea53fe26eb2719ce9f5 (diff) | |
| download | Qt-c9135a429441cb00720866604b79d6613000f7c5.zip Qt-c9135a429441cb00720866604b79d6613000f7c5.tar.gz Qt-c9135a429441cb00720866604b79d6613000f7c5.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/extra/extra.pri
Diffstat (limited to 'src/declarative/qml/parser/qmljsnodepool_p.h')
| -rw-r--r-- | src/declarative/qml/parser/qmljsnodepool_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/parser/qmljsnodepool_p.h b/src/declarative/qml/parser/qmljsnodepool_p.h index 1a5b7f6..e2f0a3c 100644 --- a/src/declarative/qml/parser/qmljsnodepool_p.h +++ b/src/declarative/qml/parser/qmljsnodepool_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Qt Software Information (qt-info@nokia.com) ** -** This file is part of the QtScript module of the Qt Toolkit. +** This file is part of the QtDeclarative module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage |