diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-03-20 08:00:06 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-03-20 08:00:06 +0100 |
| commit | 7f0b418a2295996142488dfb24b3eef1285f7cd9 (patch) | |
| tree | 600181ee8a7782221b27373101228c0261547096 /doc | |
| parent | 098ee51a9b9dd6400a8f00112ffcee239ef3e428 (diff) | |
| parent | b17de35ef416f43ef28506e8d24aaa636848a6b6 (diff) | |
| download | qt-creator-7f0b418a2295996142488dfb24b3eef1285f7cd9.tar.gz | |
Merge remote-tracking branch 'origin/4.11' into 4.12
Change-Id: I125d2e574cbee28d69c8181909f2db57e897f0a4
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/qtcreator/src/overview/creator-acknowledgements.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/qtcreator/src/overview/creator-acknowledgements.qdoc b/doc/qtcreator/src/overview/creator-acknowledgements.qdoc index 1364f75d39..0ed535bb41 100644 --- a/doc/qtcreator/src/overview/creator-acknowledgements.qdoc +++ b/doc/qtcreator/src/overview/creator-acknowledgements.qdoc @@ -381,7 +381,7 @@ Copyright (C) 2010-2015 three.js authors\br share/qtcreator/templates/wizards/projects/qmake/qtcanvas3dapplication - \li \b{OpenSSL toolkit. Version 1.0.2j} + \li \b{OpenSSL toolkit} The OpenSSL toolkit stays under a double license, i.e. both the conditions of the OpenSSL License and the original SSLeay license apply to the toolkit. @@ -391,7 +391,7 @@ OpenSSL License ==================================================================== - Copyright (c) 1998-2018 The OpenSSL Project. All rights reserved. + Copyright (c) 1998-2019 The OpenSSL Project. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions |