diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-02-05 05:55:15 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-02-05 05:55:15 (GMT) |
| commit | b6991ebab89716293ded0033fcfea98bafa5f506 (patch) | |
| tree | bd4df06c4709d7ad8b43aa0ba08047d9458e6c1c /tests/benchmarks/declarative | |
| parent | 3c937db1af251b51d1a6e2ae15a9bebb4dae9e0c (diff) | |
| parent | d8398192d50ce9e664910ebdd42b7ada5eabaacb (diff) | |
| download | Qt-b6991ebab89716293ded0033fcfea98bafa5f506.zip Qt-b6991ebab89716293ded0033fcfea98bafa5f506.tar.gz Qt-b6991ebab89716293ded0033fcfea98bafa5f506.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Conflicts:
tests/benchmarks/declarative/painting/paintbenchmark.cpp
Diffstat (limited to 'tests/benchmarks/declarative')
| -rw-r--r-- | tests/benchmarks/declarative/painting/paintbenchmark.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/benchmarks/declarative/painting/paintbenchmark.cpp b/tests/benchmarks/declarative/painting/paintbenchmark.cpp index d14150a..d6a873c 100644 --- a/tests/benchmarks/declarative/painting/paintbenchmark.cpp +++ b/tests/benchmarks/declarative/painting/paintbenchmark.cpp @@ -1,10 +1,10 @@ /**************************************************************************** ** -** 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) ** -** This file is part of the QtDeclarative module of the Qt Toolkit. +** This file is part of the test suite of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage |