diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-04-20 21:23:34 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-04-20 21:23:34 +0300 |
| commit | c757c29c95f60b174903ced0a9ef9ea352d3bb2f (patch) | |
| tree | da3dfe45c4bc1726d894565a2eaaf95baa7e7e1c /doc | |
| parent | 72aad484276aeec5446618aeb5f63c64d9f924a5 (diff) | |
| parent | d7f1c88c35849e56f5b352f13c16a08467d1533b (diff) | |
Merge branch 'master' into DRTVWR-500
# Conflicts:
# indra/newview/pipeline.cpp
Diffstat (limited to 'doc')
| -rwxr-xr-x | doc/contributions.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index c6ad23dc2c..2153e10888 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -486,6 +486,16 @@ Geenz Spad STORM-1900 STORM-1905 NORSPEC-229 + BUG-226611 + BUG-226617 + BUG-226618 + BUG-226646 + BUG-226647 + BUG-226648 + OPEN-339 + BUG-226620 + OPEN-340 + OPEN-343 Gene Frostbite GeneJ Composer Geneko Nemeth @@ -1075,6 +1085,7 @@ Nicky Dasmijn SL-10291 SL-10293 SL-11061 + SL-11072 Nicky Perian OPEN-1 STORM-1087 @@ -1326,6 +1337,7 @@ Sovereign Engineer STORM-2148 MAINT-7343 SL-11079 + OPEN-343 SpacedOut Frye VWR-34 VWR-45 |