diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-01-14 13:35:08 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-01-14 13:35:08 +0100 |
| commit | d88a7e7a76deaa0c0e36d94a001d6f64834e22c2 (patch) | |
| tree | 80b604a84c06efaa36ddf5e6eb324caf8aea66b0 /tests/auto/qaction | |
| parent | 645f29c727f33cc9f8b00b8efcb658a050ac6a26 (diff) | |
| parent | f17aeadf56818e5f20e20eb91450e66adb88c99b (diff) | |
Merge remote branch 'origin/4.6' into lighthouse
Conflicts:
configure
src/corelib/global/qglobal.cpp
src/gui/dialogs/dialogs.pri
Diffstat (limited to 'tests/auto/qaction')
| -rw-r--r-- | tests/auto/qaction/tst_qaction.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qaction/tst_qaction.cpp b/tests/auto/qaction/tst_qaction.cpp index 1e3b143f79..26a28e721a 100644 --- a/tests/auto/qaction/tst_qaction.cpp +++ b/tests/auto/qaction/tst_qaction.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) ** |