diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-04-26 21:57:40 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-04-26 21:57:40 +0300 |
| commit | a0d7d873552dc1611eb4f8957cf99e777b199dbe (patch) | |
| tree | 4d2bff47d6d7bd253076473c85f43f17eedbc12c /doc | |
| parent | 2ea5c5986a467e253ad0131b4af0faee23b263a4 (diff) | |
| parent | d7f1c88c35849e56f5b352f13c16a08467d1533b (diff) | |
Merge branch 'master' into DRTVWR-460
# Conflicts:
# indra/llmath/llquaternion.h
# indra/newview/lldrawpoolwater.cpp
# indra/newview/lljoystickbutton.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/textures/textures.xml
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 d401620b2c..36b65ae84d 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -485,6 +485,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 @@ -1074,6 +1084,7 @@ Nicky Dasmijn SL-10291 SL-10293 SL-11061 + SL-11072 Nicky Perian OPEN-1 STORM-1087 @@ -1325,6 +1336,7 @@ Sovereign Engineer STORM-2148 MAINT-7343 SL-11079 + OPEN-343 SpacedOut Frye VWR-34 VWR-45 |