diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-22 09:04:29 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-22 09:25:54 +0200 |
| commit | aed5a7168354c6ae47687d20b4bd3f0adcc14f8e (patch) | |
| tree | d2060479a7c12fdba8c1955e5d363754feffabb8 /src/3rdparty/angle/CONTRIBUTORS | |
| parent | d3d10cf23d61f4a011f1a7e9abdee1a92717e80f (diff) | |
| parent | 628fa13ea4d6ff0e2e2ee76c9adfc78676de3c59 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/corelib/statemachine/qstatemachine.cpp
src/corelib/statemachine/qstatemachine_p.h
src/gui/painting/qdrawhelper.cpp
src/plugins/platforms/xcb/qxcbnativeinterface.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.h
src/testlib/qtestblacklist.cpp
src/tools/qdoc/node.cpp
src/tools/qdoc/node.h
tests/auto/gui/painting/qcolor/tst_qcolor.cpp
Change-Id: I6c78b7b162001712d5774293f501b06b4ff32684
Diffstat (limited to 'src/3rdparty/angle/CONTRIBUTORS')
| -rw-r--r-- | src/3rdparty/angle/CONTRIBUTORS | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/src/3rdparty/angle/CONTRIBUTORS b/src/3rdparty/angle/CONTRIBUTORS index 6b27416e38..5252141973 100644 --- a/src/3rdparty/angle/CONTRIBUTORS +++ b/src/3rdparty/angle/CONTRIBUTORS @@ -1,4 +1,4 @@ -# This is the official list of people who can contribute +# This is the official list of people who can contribute # (and who have contributed) code to the ANGLE project # repository. # The AUTHORS file lists the copyright holders; this file @@ -40,6 +40,7 @@ Google Inc. thestig@chromium.org Justin Schuh Scott Graham + Corentin Wallez Adobe Systems Inc. Alexandru Chiculita @@ -55,6 +56,9 @@ Cloud Party, Inc. The Qt Company Ltd. Andrew Knight +Imagination Technologies Ltd. + Gregoire Payen de La Garanderie + Intel Corporation Jin Yang Andy Chen @@ -80,10 +84,21 @@ Mark Banner (standard8mbp) David Kilzer Jacek Caban Tibor den Ouden +Régis Fénéon + +Microsoft Corporation + Cooper Partin + Austin Kinross + Minmin Gong Microsoft Open Technologies, Inc. -Cooper Partin -Austin Kinross + Cooper Partin + Austin Kinross NVIDIA Corporation Olli Etuaho + Arun Patole + Qingqing Deng + +Opera Software ASA + Daniel Bratell |