summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlcompileddata.cpp
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2010-02-19 00:22:59 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2010-02-19 00:22:59 (GMT)
commitaf47bfaee19cb2924b4fde69ec5c4c14601dfc96 (patch)
tree30daabc8745103df89ea6dd21bf331d574cb5201 /src/declarative/qml/qmlcompileddata.cpp
parentda055325393872e9399577d1962486fb6e3102c7 (diff)
parent7175c49346a147558d65c5b10565423a6d8ea9ec (diff)
downloadQt-af47bfaee19cb2924b4fde69ec5c4c14601dfc96.zip
Qt-af47bfaee19cb2924b4fde69ec5c4c14601dfc96.tar.gz
Qt-af47bfaee19cb2924b4fde69ec5c4c14601dfc96.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'src/declarative/qml/qmlcompileddata.cpp')
-rw-r--r--src/declarative/qml/qmlcompileddata.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlcompileddata.cpp b/src/declarative/qml/qmlcompileddata.cpp
index 48a0893..0120f56 100644
--- a/src/declarative/qml/qmlcompileddata.cpp
+++ b/src/declarative/qml/qmlcompileddata.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**