diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-04-21 15:37:25 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-04-21 15:37:25 +0300 |
| commit | 4cf42435733a111610a13620c56728b1b659b1e9 (patch) | |
| tree | 5ac5ac10070448dcfdf38bf36e23ea9b6b766f95 /doc/contributions.txt | |
| parent | dcb6b5489d2c3cfdb13d5862f8cb29fee06745a7 (diff) | |
| parent | d7f1c88c35849e56f5b352f13c16a08467d1533b (diff) | |
Merge branch 'master' into DRTVWR-483
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/xui/de/floater_preview_texture.xml
# indra/newview/skins/default/xui/es/floater_preview_texture.xml
# indra/newview/skins/default/xui/fr/floater_preview_texture.xml
# indra/newview/skins/default/xui/it/floater_preview_texture.xml
# indra/newview/skins/default/xui/ja/panel_edit_classified.xml
# indra/newview/skins/default/xui/ja/panel_me.xml
# indra/newview/skins/default/xui/ru/floater_preview_texture.xml
# indra/newview/skins/default/xui/tr/floater_picks.xml
# indra/newview/skins/default/xui/tr/floater_preview_texture.xml
# indra/newview/skins/default/xui/tr/panel_edit_classified.xml
# indra/newview/skins/default/xui/tr/panel_me.xml
# indra/newview/skins/default/xui/zh/floater_preview_texture.xml
Diffstat (limited to 'doc/contributions.txt')
| -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 6a22e75fbf..418af1d3a5 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 @@ -1076,6 +1086,7 @@ Nicky Dasmijn SL-10291 SL-10293 SL-11061 + SL-11072 Nicky Perian OPEN-1 STORM-1087 @@ -1327,6 +1338,7 @@ Sovereign Engineer STORM-2148 MAINT-7343 SL-11079 + OPEN-343 SpacedOut Frye VWR-34 VWR-45 |