diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-01-16 10:17:08 +1000 |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2012-01-16 10:32:26 +1000 |
| commit | 0f659fd14908453593b1ba45d98bbae69488d704 (patch) | |
| tree | 632d67b571f74a5e3894aeef2bacb50d1319e9c5 /tools/qmlviewer/qdeclarativetester.h | |
| parent | 903a07f681c8e32564f9d26bc67e02a95117808e (diff) | |
| parent | ef1860e8c47a5816b151e5d63dbc0db196f9d0a8 (diff) | |
Merge branch 'master' into animation-refactor
Conflicts:
src/quick/util/qdeclarativetimer.cpp
tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
Change-Id: I981b0d01c71035f6611682e742f4330d0ef7891b
Diffstat (limited to 'tools/qmlviewer/qdeclarativetester.h')
| -rw-r--r-- | tools/qmlviewer/qdeclarativetester.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qmlviewer/qdeclarativetester.h b/tools/qmlviewer/qdeclarativetester.h index 3b48637ac2..04418a1e23 100644 --- a/tools/qmlviewer/qdeclarativetester.h +++ b/tools/qmlviewer/qdeclarativetester.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** |