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 /src/assistant/clucene/qindexwriter.cpp | |
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 'src/assistant/clucene/qindexwriter.cpp')
-rw-r--r-- | src/assistant/clucene/qindexwriter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/assistant/clucene/qindexwriter.cpp b/src/assistant/clucene/qindexwriter.cpp index 4b1557ae5..d07ee475a 100644 --- a/src/assistant/clucene/qindexwriter.cpp +++ b/src/assistant/clucene/qindexwriter.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team. ** All rights reserved. ** -** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** All rights reserved. ** ** This file may be used under the terms of the GNU Lesser General Public |