diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-10-22 13:57:36 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-10-22 13:57:36 (GMT) |
| commit | 928387618011af72e0011287e1002a9b51a6e51f (patch) | |
| tree | 0b21247fa7514e22d6469c680189e80481ddde0a /doc | |
| parent | c29bc376c957867b57a6dd32549db6ae67be4f60 (diff) | |
| download | Qt-928387618011af72e0011287e1002a9b51a6e51f.zip Qt-928387618011af72e0011287e1002a9b51a6e51f.tar.gz Qt-928387618011af72e0011287e1002a9b51a6e51f.tar.bz2 | |
Doc: Added Windows Vista to the trademark list.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/legal/trademarks.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/legal/trademarks.qdoc b/doc/src/legal/trademarks.qdoc index e69d57c..3bf783f 100644 --- a/doc/src/legal/trademarks.qdoc +++ b/doc/src/legal/trademarks.qdoc @@ -44,9 +44,9 @@ countries or both. \o Mac, Mac OS and Macintosh are \reg trademarks of Apple Computer, Inc., registered in the U.S. and other countries. - \o Microsoft, Windows, Windows NT, XP, Visual Studio and the Windows logo - are \reg trademarks of Microsoft Corporation in the United States, other - countries, or both. + \o Microsoft, Windows, Windows NT, XP, Windows Vista, Visual Studio and the + Windows logo are \reg trademarks of Microsoft Corporation in the United + States, other countries, or both. \o Motif is a registered trademark of The Open Group in the United States, other countries, or both. \o OpenGL is a \reg trademark of Silicon Graphics, Inc. in the United States |