diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:34:29 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:34:29 +0200 |
commit | 981cdca0a5f874fb02694ae5bb39c99784762481 (patch) | |
tree | f7001c629f918e6fff756574128cb068dd25d309 /doc/contributions.txt | |
parent | f9e7e59405a161828ec5dde624299b8aa67dc5b7 (diff) | |
parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) |
Merge branch 'master' into DRTVWR-483
# Conflicts:
# indra/llui/lltextbase.h
# indra/newview/VIEWER_VERSION.txt
Diffstat (limited to 'doc/contributions.txt')
-rwxr-xr-x | doc/contributions.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 8039e99f87..e918a0d3ac 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -271,6 +271,7 @@ Beq Janus SL-13583 SL-14766 SL-14927 + SL-11300 Beth Walcher Bezilon Kasei Biancaluce Robbiani @@ -807,6 +808,7 @@ Jonathan Yap STORM-2104 STORM-2142 SL-10089 + BUG-229818 Kadah Coba STORM-1060 STORM-1843 @@ -1360,7 +1362,8 @@ Sovereign Engineer MAINT-7343 SL-11079 OPEN-343 - SL-11625 + SL-11625 + BUG-229030 SL-14705 SL-14706 SL-14707 |