diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-01-19 11:40:49 +1000 |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-01-19 11:40:49 +1000 |
| commit | ebd4bc73c46c2962742a682b6a391fb68c482aec (patch) | |
| tree | 3045a1af9e65ca6500437d4e90ccfd3637fb6976 /demos/spectrum/3rdparty | |
| parent | 9c1e67d83f6175f339e6771be05ee60ba72426b3 (diff) | |
| parent | 5d9738ed88da269033333299c16558882d346514 (diff) | |
| download | qt4-tools-ebd4bc73c46c2962742a682b6a391fb68c482aec.tar.gz | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
Diffstat (limited to 'demos/spectrum/3rdparty')
| -rw-r--r-- | demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp | 2 | ||||
| -rw-r--r-- | demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp b/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp index 50ab36d352..2e66bc06d5 100644 --- a/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp +++ b/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.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). ** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the examples of the Qt Toolkit. diff --git a/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h b/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h index 48d614eb06..39a1d576e8 100644 --- a/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h +++ b/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h @@ -1,6 +1,6 @@ /*************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the examples of the Qt Toolkit. |