diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-01-29 06:51:18 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-01-29 06:51:18 (GMT) |
| commit | 245f2d6d8bf32dcfa28501a9944de00e1e4e1875 (patch) | |
| tree | bba1eb8796905fb1ed3d92c59f8841cf848bf2aa /src/xmlpatterns/parser/qxslttokenlookup.cpp | |
| parent | 7123ef04484f283ffa30ece8cb73f541bd81e830 (diff) | |
| parent | 2f91e9ce0e02f613d68b5b59d00b61c8f4f12c68 (diff) | |
| download | Qt-245f2d6d8bf32dcfa28501a9944de00e1e4e1875.zip Qt-245f2d6d8bf32dcfa28501a9944de00e1e4e1875.tar.gz Qt-245f2d6d8bf32dcfa28501a9944de00e1e4e1875.tar.bz2 | |
Merge ../../qt/master
Conflicts:
tests/auto/tests.xml
Diffstat (limited to 'src/xmlpatterns/parser/qxslttokenlookup.cpp')
| -rw-r--r-- | src/xmlpatterns/parser/qxslttokenlookup.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xmlpatterns/parser/qxslttokenlookup.cpp b/src/xmlpatterns/parser/qxslttokenlookup.cpp index a46ec8a..781ba0d 100644 --- a/src/xmlpatterns/parser/qxslttokenlookup.cpp +++ b/src/xmlpatterns/parser/qxslttokenlookup.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** |