summaryrefslogtreecommitdiff
path: root/tests/auto/linguist/lupdate/testdata/good/proparsing2/e
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-01-17 18:25:39 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-01-17 18:25:39 +0100
commit6863ce4e3582745ad683df646746fe23a8e21592 (patch)
tree8bae39f23dddd59a80d9942a45d60ccf414f7810 /tests/auto/linguist/lupdate/testdata/good/proparsing2/e
parentb18f31c9aebd273fd58646dc484d44b91662fa7a (diff)
parent9b0b4e799aadde36521acff0dc3439b4eae51877 (diff)
downloadqttools-6863ce4e3582745ad683df646746fe23a8e21592.tar.gz
Merge remote-tracking branch 'origin/stable' into dev
Conflicts: sync.profile Change-Id: I9871b004cc76d14d34f4a904cd7a8e4f8e2bb91a
Diffstat (limited to 'tests/auto/linguist/lupdate/testdata/good/proparsing2/e')
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/proparsing2/e2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing2/e b/tests/auto/linguist/lupdate/testdata/good/proparsing2/e
index 4d219644b..f5f4b1e68 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/e
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/e
@@ -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 test suite of the Qt Toolkit.