diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-12 14:11:23 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-12 14:11:23 +0100 |
| commit | 9af58b33d4488963bd4d7bd6da8b94fcc8ada41c (patch) | |
| tree | 9820da74433c735d24348ae9d55e0d3a1830412d /doc/src/legal | |
| parent | d8156dceb59b988c2ad6a4f4d94b875ef5c1071b (diff) | |
| parent | 41dae70a7d4916b76ee8213b00ef06795c549f47 (diff) | |
| download | qtdoc-9af58b33d4488963bd4d7bd6da8b94fcc8ada41c.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ia7b482a59bf40d450c338f582a6b72a19a6df576
Diffstat (limited to 'doc/src/legal')
| -rw-r--r-- | doc/src/legal/3rdparty.qdoc | 6 | ||||
| -rw-r--r-- | doc/src/legal/licenses.qdoc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc index 31721a9a..6da95289 100644 --- a/doc/src/legal/3rdparty.qdoc +++ b/doc/src/legal/3rdparty.qdoc @@ -231,7 +231,7 @@ \section1 MD4 (md4.cpp and md4.h) \e{MD4 (RFC-1320) message digest.}\br - \e{Modified from MD5 code by Andrey Panin <pazke@donpac.ru> + \e{Modified from MD5 code by Andrey Panin <pazke@donpac.ru>} Written by Solar Designer <solar@openwall.com> in 2001, and placed in the public domain. There's absolutely no warranty. @@ -362,8 +362,8 @@ \section1 SHA-1 (sha1.cpp) - \e{Based on the public domain implementation of the SHA-1 algorithm\br - Copyright (C) Dominik Reichl <dominik.reichl@t-online.de>} + \e{Based on the public domain implementation of the SHA-1 algorithm}\br + \e{Copyright (C) Dominik Reichl <dominik.reichl@t-online.de>} See \c qtbase/src/3rdparty/sha1/sha1.cpp for more information about the terms and conditions under which the code is supplied. diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc index 60c84df8..66579a8d 100644 --- a/doc/src/legal/licenses.qdoc +++ b/doc/src/legal/licenses.qdoc @@ -1095,9 +1095,9 @@ \section1 DES (\c des.cpp) - \e{Implementation of DES encryption for NTLM\br - Copyright 1997-2005 Simon Tatham.\br - This software is released under the MIT license.} + \e{Implementation of DES encryption for NTLM}\br + \e{Copyright 1997-2005 Simon Tatham.}\br + \e{This software is released under the MIT license.} See \c qtbase/src/3rdparty/des/des.cpp for more information about the terms and conditions under which the code is supplied. |