diff options
| author | Runitai Linden <davep@lindenlab.com> | 2022-01-21 10:33:37 -0600 |
|---|---|---|
| committer | Runitai Linden <davep@lindenlab.com> | 2022-01-21 10:33:37 -0600 |
| commit | 5b04123aec281de30fb8b6473600f6b1e9d16909 (patch) | |
| tree | 1ffac17fe885182483ed44fa93db723554761024 /doc | |
| parent | e7caafba5c4eec21f02a642e37865bc04cd6536e (diff) | |
| parent | 016b002b0f2faae0d62ce2d07b8e9856a3a1814d (diff) | |
Merge remote-tracking branch 'remotes/origin/DRTVWR-546' into DRTVWR-539
# Conflicts:
# indra/llcommon/lltracerecording.h
# indra/newview/llfloaterpreference.cpp
Diffstat (limited to 'doc')
| -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 e029c29a18..e08183f7c0 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -278,6 +278,8 @@ Beq Janus SL-14766 SL-14927 SL-11300 + SL-15709 + SL-16021 Beth Walcher Bezilon Kasei Biancaluce Robbiani @@ -1367,7 +1369,7 @@ Sovereign Engineer MAINT-7343 SL-11079 OPEN-343 - SL-11625 + SL-11625 BUG-229030 SL-14705 SL-14706 @@ -1375,6 +1377,7 @@ Sovereign Engineer SL-14731 SL-14732 SL-15096 + SL-16127 SpacedOut Frye VWR-34 VWR-45 |