summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@theqtcompany.com>2014-11-25 11:46:55 +0100
committerEike Ziller <eike.ziller@theqtcompany.com>2014-12-04 07:52:48 +0100
commit0dfb84da9e79d9f367f6e9cb08d8e031d7ede001 (patch)
tree726aad1d3433d9343c39d077460863f7224de488
parent77fa127519db407d25d2626d9a78a6056d614d95 (diff)
downloadqt-creator-0dfb84da9e79d9f367f6e9cb08d8e031d7ede001.tar.gz
Add ANGLE library to Acknowledgements
Change-Id: I2f3b7a3c2bf185adbf4e97d82cf8e5f8d9164736 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
-rw-r--r--doc/src/overview/creator-acknowledgements.qdoc37
1 files changed, 37 insertions, 0 deletions
diff --git a/doc/src/overview/creator-acknowledgements.qdoc b/doc/src/overview/creator-acknowledgements.qdoc
index 00fc60109f..21d61a80db 100644
--- a/doc/src/overview/creator-acknowledgements.qdoc
+++ b/doc/src/overview/creator-acknowledgements.qdoc
@@ -92,6 +92,43 @@
\li QtCreator/src/libs/3rdparty
\li \l{http://qt.gitorious.org/qt-creator/qt-creator/trees/master/src/libs/3rdparty}
\endlist
+
+ \li \b{ANGLE (Windows)}
+
+ Copyright (C) 2002-2013 The ANGLE Project Authors.\br
+ All rights reserved.\br\br
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:\br\br
+
+ Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.\br\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\br
+
+ Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+ Ltd., nor the names of their contributors may be used to endorse
+ or promote products derived from this software without specific
+ prior written permission.\br\br
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.\br\br
+
+ The source code of ANGLE is part of the Qt libraries.
\br\br
\endlist