diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 18:23:27 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 18:23:52 +0100 |
| commit | 0bd009dfadb2e2187b29ebd27a6e6fdf8ff89c66 (patch) | |
| tree | 153b66e48df75f54330cfb01a37c4419972b28b1 /tests/manual/testbed/TestZoomBlur.qml | |
| parent | 04a49468fda65936c0b6b349266bf029d8041212 (diff) | |
| parent | 1444a08b7e16a09f056f3bed24cf843d29874cba (diff) | |
| download | qtgraphicaleffects-0bd009dfadb2e2187b29ebd27a6e6fdf8ff89c66.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
sync.profile
Change-Id: Idd8799885298e5fcef5ecc2c40bf0688fa6aa995
Diffstat (limited to 'tests/manual/testbed/TestZoomBlur.qml')
| -rw-r--r-- | tests/manual/testbed/TestZoomBlur.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/manual/testbed/TestZoomBlur.qml b/tests/manual/testbed/TestZoomBlur.qml index c8c8bb5..a0ae53b 100644 --- a/tests/manual/testbed/TestZoomBlur.qml +++ b/tests/manual/testbed/TestZoomBlur.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Graphical Effects module. |