diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-09-13 10:26:03 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-09-13 10:46:16 (GMT) |
| commit | 06dc8791a70329dc8e985a0eed7e434d1f762ec5 (patch) | |
| tree | f3a9f55307207088676d4c48ec67ec418fa56053 /src/xmlpatterns | |
| parent | 59a2ff150795e1281e6b4fea435e74d3434a5ad2 (diff) | |
| parent | 31cc0b1820c0c8fdfdbc3d5b804f2dba2051c96f (diff) | |
| download | Qt-06dc8791a70329dc8e985a0eed7e434d1f762ec5.zip Qt-06dc8791a70329dc8e985a0eed7e434d1f762ec5.tar.gz Qt-06dc8791a70329dc8e985a0eed7e434d1f762ec5.tar.bz2 | |
Merge remote branch 'qt/master' into lighthouse-master
Conflicts:
configure
src/corelib/global/qglobal.h
src/corelib/tools/qsimd.cpp
Diffstat (limited to 'src/xmlpatterns')
| -rwxr-xr-x | src/xmlpatterns/parser/createTokenLookup.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/xmlpatterns/parser/createTokenLookup.sh b/src/xmlpatterns/parser/createTokenLookup.sh index 01af6ca..e11a3ba 100755 --- a/src/xmlpatterns/parser/createTokenLookup.sh +++ b/src/xmlpatterns/parser/createTokenLookup.sh @@ -71,16 +71,16 @@ license=`cat <<EOF ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this ** package. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** ** If you are unsure which license is appropriate for your use, please ** contact the sales department at http://qt.nokia.com/contact. +** +** +** +** +** +** +** +** ** \\$QT_END_LICENSE\\$ ** ****************************************************************************/ |