diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-02-09 15:45:28 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-02-09 15:45:28 (GMT) |
| commit | c908a57a54b7ad63ec06b7dcf7b3c5a4d54dd999 (patch) | |
| tree | d313be14b4574a78354ec9dad8dcd1e6fd0c54de /doc/src/legal/3rdparty.qdoc | |
| parent | 3abc322eb6834aa61cc77d73dbd17c4389accb00 (diff) | |
| parent | 4027c52d9fb6ea1bca13e1f3a2bc5ac5032387e0 (diff) | |
| download | Qt-c908a57a54b7ad63ec06b7dcf7b3c5a4d54dd999.zip Qt-c908a57a54b7ad63ec06b7dcf7b3c5a4d54dd999.tar.gz Qt-c908a57a54b7ad63ec06b7dcf7b3c5a4d54dd999.tar.bz2 | |
Merge branch 'qdoc-i18n'
Diffstat (limited to 'doc/src/legal/3rdparty.qdoc')
| -rw-r--r-- | doc/src/legal/3rdparty.qdoc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc index b710449..bb2effa 100644 --- a/doc/src/legal/3rdparty.qdoc +++ b/doc/src/legal/3rdparty.qdoc @@ -116,9 +116,9 @@ \hr - Copyright (C) 2004,2007 Red Hat, Inc.\br - Copyright (C) 1998-2004 David Turner and Werner Lemberg\br - Copyright (C) 2006 Behdad Esfahbod\br + Copyright (C) 2004,2007 Â Red Hat, Inc.\br + Copyright (C) 1998-2004 Â David Turner and Werner Lemberg\br + Copyright (C) 2006 Â Behdad Esfahbod\br Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) This is part of HarfBuzz, an OpenType Layout engine library. @@ -137,7 +137,7 @@ THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + FITNESS FOR A PARTICULAR PURPOSE. Â THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. @@ -323,7 +323,7 @@ duplicated in all such forms and that any documentation, advertising materials, and other materials related to such distribution and use acknowledge that the software was developed - by the University of California, Berkeley. The name of the + by the University of California, Berkeley. Â The name of the University may not be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR @@ -364,7 +364,7 @@ documentation for such software. THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED - WARRANTY. IN PARTICULAR, NEITHER THE AUTHOR NOR LUCENT MAKES ANY + WARRANTY. Â IN PARTICULAR, NEITHER THE AUTHOR NOR LUCENT MAKES ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE. |