diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-01-19 11:40:49 +1000 |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-01-19 11:40:49 +1000 |
| commit | ebd4bc73c46c2962742a682b6a391fb68c482aec (patch) | |
| tree | 3045a1af9e65ca6500437d4e90ccfd3637fb6976 /tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2 | |
| parent | 9c1e67d83f6175f339e6771be05ee60ba72426b3 (diff) | |
| parent | 5d9738ed88da269033333299c16558882d346514 (diff) | |
| download | qt4-tools-ebd4bc73c46c2962742a682b6a391fb68c482aec.tar.gz | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
Diffstat (limited to 'tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2')
| -rw-r--r-- | tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub1/main.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub2/main.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub1/main.cpp b/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub1/main.cpp index 8c82c80a36..cc78f8a5d7 100644 --- a/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub1/main.cpp +++ b/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub1/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub2/main.cpp b/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub2/main.cpp index ff859369cb..ff061beba0 100644 --- a/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub2/main.cpp +++ b/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub2/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** |