diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:51 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:52 +0200 |
commit | 881ceeff428c377d02ae3881beccdbb028385075 (patch) | |
tree | 65bd4335d7f67b81b04e33f2cbb17a41cf966dd8 /src/3rdparty/angle/CONTRIBUTORS | |
parent | b3d2c867ed14cd6337d5e32b8750f198b5b7d331 (diff) | |
parent | 106487387d493dab934e19b33bfed55b8df62d67 (diff) |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I05fcd8dc66d9ad0dc76bb7f5bae05c9876bfba14
Diffstat (limited to 'src/3rdparty/angle/CONTRIBUTORS')
-rw-r--r-- | src/3rdparty/angle/CONTRIBUTORS | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/3rdparty/angle/CONTRIBUTORS b/src/3rdparty/angle/CONTRIBUTORS index 7d152e7abf..0cae10a0f6 100644 --- a/src/3rdparty/angle/CONTRIBUTORS +++ b/src/3rdparty/angle/CONTRIBUTORS @@ -59,6 +59,7 @@ Intel Corporation Jin Yang Andy Chen Josh Triplett + Sudarsana Nagineni Klarälvdalens Datakonsult AB Milian Wolff @@ -78,3 +79,6 @@ Ulrik Persson (ddefrostt) Mark Banner (standard8mbp) David Kilzer +Microsoft Open Technologies, Inc. +Cooper Partin +Austin Kinross |