diff options
| author | Morten Sørvig <msorvig@trolltech.com> | 2009-08-24 14:02:51 +0200 |
|---|---|---|
| committer | Morten Sørvig <msorvig@trolltech.com> | 2009-08-24 14:02:51 +0200 |
| commit | e3078a5db9e092d78813180ce077789551929e4f (patch) | |
| tree | fce2a4b5607c8dc796faececf71f78ae83effe4e /util/qlalr/lalr.g | |
| parent | 3a801a667c7c78076fc4aa84e47432ddd4a382a5 (diff) | |
| parent | db0ebfd97d14bf3c537957d9642ba014318f8418 (diff) | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'util/qlalr/lalr.g')
| -rw-r--r-- | util/qlalr/lalr.g | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/util/qlalr/lalr.g b/util/qlalr/lalr.g index 548223fb5..c98c2afb5 100644 --- a/util/qlalr/lalr.g +++ b/util/qlalr/lalr.g @@ -3,7 +3,7 @@ -- Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -- Contact: Nokia Corporation (qt-info@nokia.com) -- --- This file is part of the QLALR project on Trolltech Labs. +-- This file is part of the QLALR project on Qt Labs. -- -- $QT_BEGIN_LICENSE:LGPL$ -- No Commercial Usage @@ -34,7 +34,7 @@ -- 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://www.qtsoftware.com/contact. +-- contact the sales department at http://qt.nokia.com/contact. -- $QT_END_LICENSE$ -- -- This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE @@ -83,7 +83,7 @@ ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the <your project> project on Trolltech Labs. +** This file is part of the QLALR project on Qt Labs. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -114,7 +114,7 @@ ** 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://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -197,7 +197,7 @@ protected: ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the <your project> project on Trolltech Labs. +** This file is part of the QLALR project on Qt Labs. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -228,7 +228,7 @@ protected: ** 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://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ |