diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-18 15:19:46 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-18 15:19:46 (GMT) |
| commit | e09de4df3ab7f57c107a1b14b80dec5728292b05 (patch) | |
| tree | 3be262311cfbaabcf03e1ade105e7d65fb591d44 /doc/src/legal | |
| parent | 64158ff163a53ff97d8ae211b0bddaae346f0f7c (diff) | |
| parent | c18beac8163634b48bbf1e7280923e96f5ef0a51 (diff) | |
| download | Qt-e09de4df3ab7f57c107a1b14b80dec5728292b05.zip Qt-e09de4df3ab7f57c107a1b14b80dec5728292b05.tar.gz Qt-e09de4df3ab7f57c107a1b14b80dec5728292b05.tar.bz2 | |
Merge remote branch 'qt/master' into staging-2-master
Conflicts:
tools/assistant/tools/assistant/helpviewer_qtb.h
tools/assistant/tools/assistant/helpviewer_qwv.cpp
tools/assistant/tools/assistant/helpviewer_qwv.h
Diffstat (limited to 'doc/src/legal')
| -rw-r--r-- | doc/src/legal/licenses.qdoc | 16 | ||||
| -rw-r--r-- | doc/src/legal/trademarks.qdoc | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc index 9e680a6..344ebd4 100644 --- a/doc/src/legal/licenses.qdoc +++ b/doc/src/legal/licenses.qdoc @@ -276,14 +276,14 @@ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\br - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer.\br - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution.\br - * Neither the name of Research In Motion Limited nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. + Â Â * Redistributions of source code must retain the above copyright + Â Â Â notice, this list of conditions and the following disclaimer.\br + Â Â * Redistributions in binary form must reproduce the above copyright + Â Â Â notice, this list of conditions and the following disclaimer in the + Â Â Â documentation and/or other materials provided with the distribution.\br + Â Â * Neither the name of Research In Motion Limited nor the + Â Â Â names of its contributors may be used to endorse or promote products + Â Â Â derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY Research In Motion Limited ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED diff --git a/doc/src/legal/trademarks.qdoc b/doc/src/legal/trademarks.qdoc index a7b5764..23d0cf6 100644 --- a/doc/src/legal/trademarks.qdoc +++ b/doc/src/legal/trademarks.qdoc @@ -47,7 +47,7 @@ \brief Information about trademarks owned by Nokia and other organisations. Nokia, the Nokia logo, Qt, and the Qt logo are trademarks of Nokia - Corporation and/or its subsidiaries in Finland and other countries. + Â Corporation and/or its subsidiaries in Finland and other countries. \list \o Intel, Intel Inside (logos), MMX and Pentium are \reg trademarks of |