diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-09-29 04:09:01 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-09-29 04:09:01 (GMT) |
| commit | 575ad2c60482b279f828cfa87186b5fbb10f76c6 (patch) | |
| tree | 101df52cd4b769dc8d10ef60714f25d819636e70 /util/qlalr | |
| parent | a913e326409062bbc1cad4d5898181c7b81cba23 (diff) | |
| parent | 638f46a96b68d21137c4903c68015752ebdf58dc (diff) | |
| download | Qt-575ad2c60482b279f828cfa87186b5fbb10f76c6.zip Qt-575ad2c60482b279f828cfa87186b5fbb10f76c6.tar.gz Qt-575ad2c60482b279f828cfa87186b5fbb10f76c6.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure.exe
mkspecs/features/qt.prf
Diffstat (limited to 'util/qlalr')
| -rw-r--r-- | util/qlalr/compress.h | 2 | ||||
| -rw-r--r-- | util/qlalr/cppgenerator.cpp | 2 | ||||
| -rw-r--r-- | util/qlalr/cppgenerator.h | 2 | ||||
| -rw-r--r-- | util/qlalr/dotgraph.h | 2 | ||||
| -rw-r--r-- | util/qlalr/grammar_p.h | 2 | ||||
| -rw-r--r-- | util/qlalr/lalr.h | 2 | ||||
| -rw-r--r-- | util/qlalr/parsetable.h | 2 | ||||
| -rw-r--r-- | util/qlalr/recognizer.h | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/util/qlalr/compress.h b/util/qlalr/compress.h index 5619afc..bf779cc 100644 --- a/util/qlalr/compress.h +++ b/util/qlalr/compress.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QLALR project on Qt Labs. +** This file is part of the utils of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/util/qlalr/cppgenerator.cpp b/util/qlalr/cppgenerator.cpp index 335e13b..459c35e 100644 --- a/util/qlalr/cppgenerator.cpp +++ b/util/qlalr/cppgenerator.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QLALR project on Qt Labs. +** This file is part of the utils of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/util/qlalr/cppgenerator.h b/util/qlalr/cppgenerator.h index 8aa7147..98f3a8c 100644 --- a/util/qlalr/cppgenerator.h +++ b/util/qlalr/cppgenerator.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QLALR project on Qt Labs. +** This file is part of the utils of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/util/qlalr/dotgraph.h b/util/qlalr/dotgraph.h index df4d216..9a71769 100644 --- a/util/qlalr/dotgraph.h +++ b/util/qlalr/dotgraph.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QLALR project on Qt Labs. +** This file is part of the utils of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/util/qlalr/grammar_p.h b/util/qlalr/grammar_p.h index 3f0c0d0..1794fe5 100644 --- a/util/qlalr/grammar_p.h +++ b/util/qlalr/grammar_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QLALR project on Qt Labs. +** This file is part of the utils of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/util/qlalr/lalr.h b/util/qlalr/lalr.h index 7d7c692..1dd843f 100644 --- a/util/qlalr/lalr.h +++ b/util/qlalr/lalr.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QLALR project on Qt Labs. +** This file is part of the utils of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/util/qlalr/parsetable.h b/util/qlalr/parsetable.h index f2cd264..6d5490a 100644 --- a/util/qlalr/parsetable.h +++ b/util/qlalr/parsetable.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QLALR project on Qt Labs. +** This file is part of the utils of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/util/qlalr/recognizer.h b/util/qlalr/recognizer.h index fdc6448..667517e 100644 --- a/util/qlalr/recognizer.h +++ b/util/qlalr/recognizer.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QLALR project on Qt Labs. +** This file is part of the utils of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage |