diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 18:25:39 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 18:25:39 +0100 |
commit | 6863ce4e3582745ad683df646746fe23a8e21592 (patch) | |
tree | 8bae39f23dddd59a80d9942a45d60ccf414f7810 /tests/auto/uiloader/baseline/phrasebookbox.ui | |
parent | b18f31c9aebd273fd58646dc484d44b91662fa7a (diff) | |
parent | 9b0b4e799aadde36521acff0dc3439b4eae51877 (diff) | |
download | qttools-6863ce4e3582745ad683df646746fe23a8e21592.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
sync.profile
Change-Id: I9871b004cc76d14d34f4a904cd7a8e4f8e2bb91a
Diffstat (limited to 'tests/auto/uiloader/baseline/phrasebookbox.ui')
-rw-r--r-- | tests/auto/uiloader/baseline/phrasebookbox.ui | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/uiloader/baseline/phrasebookbox.ui b/tests/auto/uiloader/baseline/phrasebookbox.ui index 270cce3cd..34d09d13e 100644 --- a/tests/auto/uiloader/baseline/phrasebookbox.ui +++ b/tests/auto/uiloader/baseline/phrasebookbox.ui @@ -1,7 +1,7 @@ <ui version="4.0" > <comment>********************************************************************* ** -** 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 autotests of the Qt Toolkit. |