diff options
| author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-04-14 14:23:20 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-04-14 14:26:46 +0300 |
| commit | 5ba7f70d0d94de720d49b37b2d257b51b9afd026 (patch) | |
| tree | 19f8f355a85a913a194cf610731ceebd8d8fb643 /tests/spectrum/3rdparty/fftreal | |
| parent | 62f90e25eec23cfac83985993f355feeac5b9f2c (diff) | |
| parent | 916d67d2664b0262cd03b28ad0c694924dd09b13 (diff) | |
Merge branch 'develop'v1.2.1
Change-Id: I58fa595eee1cf9ab934cb3187981355d6a856d05
Diffstat (limited to 'tests/spectrum/3rdparty/fftreal')
| -rw-r--r-- | tests/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp | 2 | ||||
| -rw-r--r-- | tests/spectrum/3rdparty/fftreal/fftreal_wrapper.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp b/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp index 618709f7..461c3907 100644 --- a/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp +++ b/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp @@ -1,6 +1,6 @@ /*************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of QtDataVisualization. diff --git a/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.h b/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.h index 92ee5728..1b4f58fb 100644 --- a/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.h +++ b/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.h @@ -1,6 +1,6 @@ /*************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of QtDataVisualization. |