diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-18 16:19:46 +0100 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-18 16:19:46 +0100 |
| commit | e09de4df3ab7f57c107a1b14b80dec5728292b05 (patch) | |
| tree | 3be262311cfbaabcf03e1ade105e7d65fb591d44 /src/testlib | |
| parent | 64158ff163a53ff97d8ae211b0bddaae346f0f7c (diff) | |
| parent | c18beac8163634b48bbf1e7280923e96f5ef0a51 (diff) | |
| download | qt4-tools-e09de4df3ab7f57c107a1b14b80dec5728292b05.tar.gz | |
Merge remote branch 'qt/master' into staging-2-master
Conflicts:
tools/assistant/tools/assistant/helpviewer_qtb.h
tools/assistant/tools/assistant/helpviewer_qwv.cpp
tools/assistant/tools/assistant/helpviewer_qwv.h
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qbenchmarkmetric.h | 2 | ||||
| -rw-r--r-- | src/testlib/qbenchmarkmetric_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/testlib/qbenchmarkmetric.h b/src/testlib/qbenchmarkmetric.h index 302c1aadf0..18155277ac 100644 --- a/src/testlib/qbenchmarkmetric.h +++ b/src/testlib/qbenchmarkmetric.h @@ -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) ** diff --git a/src/testlib/qbenchmarkmetric_p.h b/src/testlib/qbenchmarkmetric_p.h index c919d2e5ba..f0afc0412d 100644 --- a/src/testlib/qbenchmarkmetric_p.h +++ b/src/testlib/qbenchmarkmetric_p.h @@ -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) ** |