diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-08-12 23:05:07 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-08-12 23:13:12 +0300 |
| commit | 97f09de4fcbe2a789d01ed362d6acfcac6b007b3 (patch) | |
| tree | b35db61d9bf9902d443043d289f57f6f70334678 /doc | |
| parent | 54171dbc9fe3fa42ebbf59a243b7381fdb3aa662 (diff) | |
| parent | c40b8310b00f1d620a2f5a94f2514c8bf3531373 (diff) | |
Merge branch 'master' into DRTVWR-520-apple-notarization
# Conflicts:
# autobuild.xml
# build.sh
# indra/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewermacosx.cpp
# indra/newview/llappviewerwin32.h
# indra/newview/viewer_manifest.py
# indra/win_crash_logger/llcrashloggerwindows.cpp
Diffstat (limited to 'doc')
| -rwxr-xr-x | doc/contributions.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 8ae828e738..20980fdacd 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -226,6 +226,7 @@ Ansariel Hiller SL-13364 SL-13858 SL-13697 + SL-13395 SL-3136 Aralara Rajal Arare Chantilly @@ -268,6 +269,7 @@ Beq Janus SL-11300 SL-13583 SL-14766 + SL-14927 Beth Walcher Bezilon Kasei Biancaluce Robbiani |