diff options
| author | Johanna Aijala <johanna.aijala@digia.com> | 2013-02-21 09:38:02 +0200 |
|---|---|---|
| committer | Johanna Aijala <johanna.aijala@digia.com> | 2013-02-21 09:39:00 +0200 |
| commit | ff8399920bbe272e573782e9b134e13f1726edb9 (patch) | |
| tree | c84deaee9e240543eebd19a5e96e062a5ed141f5 /tests/auto/linguist/lupdate/testdata/good/from_subdir/src/main.cpp | |
| parent | 206897d96f337f139870a2eaf173543898e7cc29 (diff) | |
| parent | 98cbd8ba0b1b91206ddd9cbf88ed4fc255e9aeb8 (diff) | |
| download | qttools-ff8399920bbe272e573782e9b134e13f1726edb9.tar.gz | |
Merge branch 'stable' into release
Change-Id: I29715c906d4d4dee985fdcfbae9a5d99c1a17997
Diffstat (limited to 'tests/auto/linguist/lupdate/testdata/good/from_subdir/src/main.cpp')
| -rw-r--r-- | tests/auto/linguist/lupdate/testdata/good/from_subdir/src/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/linguist/lupdate/testdata/good/from_subdir/src/main.cpp b/tests/auto/linguist/lupdate/testdata/good/from_subdir/src/main.cpp index 5a4816310..d3d693668 100644 --- a/tests/auto/linguist/lupdate/testdata/good/from_subdir/src/main.cpp +++ b/tests/auto/linguist/lupdate/testdata/good/from_subdir/src/main.cpp @@ -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. |