diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-19 04:45:15 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-19 04:45:15 +0200 |
| commit | 49dd88e86c8e5939fbd82d5a5316c36ade262ca2 (patch) | |
| tree | f66707306782df4229657cdc4fb25fe70ab0bd18 /doc | |
| parent | 5649bb0c2297e4597fd2c904f0e8bb3db8051240 (diff) | |
| parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) | |
Merge branch 'master' into DRTVWR-540-maint
# Conflicts:
# indra/newview/llfloatereditextdaycycle.cpp
# indra/newview/llviewerinput.cpp
Diffstat (limited to 'doc')
| -rwxr-xr-x | doc/contributions.txt | 5 | ||||
| -rw-r--r-- | doc/sl-logo.png | bin | 0 -> 9630 bytes |
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 20980fdacd..cc68162c2d 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -270,6 +270,7 @@ Beq Janus SL-13583 SL-14766 SL-14927 + SL-11300 Beth Walcher Bezilon Kasei Biancaluce Robbiani @@ -806,6 +807,7 @@ Jonathan Yap STORM-2104 STORM-2142 SL-10089 + BUG-229818 Kadah Coba STORM-1060 STORM-1843 @@ -1358,7 +1360,8 @@ Sovereign Engineer MAINT-7343 SL-11079 OPEN-343 - SL-11625 + SL-11625 + BUG-229030 SL-14705 SL-14706 SL-14707 diff --git a/doc/sl-logo.png b/doc/sl-logo.png Binary files differnew file mode 100644 index 0000000000..b9563c7ac7 --- /dev/null +++ b/doc/sl-logo.png |
