diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2011-03-11 14:04:57 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2011-03-11 14:04:57 (GMT) |
| commit | 2ec2dc55ddf424f5a7acd0a4729ddd9af2d7c398 (patch) | |
| tree | 3833140ddaca4723f452ffa6de973784380d91b2 /src/declarative/qml/qperformancetimer.cpp | |
| parent | 649e65519bef38948a818f282e3022d034dc80a5 (diff) | |
| parent | 4f3587e749a8503f6207174705ed5db74affb3a5 (diff) | |
| download | Qt-2ec2dc55ddf424f5a7acd0a4729ddd9af2d7c398.zip Qt-2ec2dc55ddf424f5a7acd0a4729ddd9af2d7c398.tar.gz Qt-2ec2dc55ddf424f5a7acd0a4729ddd9af2d7c398.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into qt-master-from-4.7
Conflicts:
src/s60installs/eabi/QtOpenVGu.def
Diffstat (limited to 'src/declarative/qml/qperformancetimer.cpp')
| -rw-r--r-- | src/declarative/qml/qperformancetimer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qperformancetimer.cpp b/src/declarative/qml/qperformancetimer.cpp index 1d7ca80..3b1e09b 100644 --- a/src/declarative/qml/qperformancetimer.cpp +++ b/src/declarative/qml/qperformancetimer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** |