summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2021-11-16 11:44:55 -0700
committerDave Houlton <euclid@lindenlab.com>2021-11-16 11:44:55 -0700
commit353329c2c2e9e8fa1ff273de2016c9e155585f45 (patch)
treef5098b9532f6d7b757b9a8fb345e7aa5e7e69108 /doc
parente95b7efd0b4469ce18bce3bc0261ecc9be06ea9c (diff)
parent9957c28ddc5e5c129af2db662da7d69f1509af65 (diff)
DRTVWR-546 merge in master v6.5.1
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt3
-rw-r--r--doc/sl-logo.pngbin0 -> 9630 bytes
2 files changed, 3 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 33b169169c..f10ea39275 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -270,6 +270,7 @@ Beq Janus
SL-13583
SL-14766
SL-14927
+ SL-11300
SL-15709
SL-16021
Beth Walcher
@@ -808,6 +809,7 @@ Jonathan Yap
STORM-2104
STORM-2142
SL-10089
+ BUG-229818
Kadah Coba
STORM-1060
STORM-1843
@@ -1361,6 +1363,7 @@ Sovereign Engineer
SL-11079
OPEN-343
SL-11625
+ BUG-229030
SL-14705
SL-14706
SL-14707
diff --git a/doc/sl-logo.png b/doc/sl-logo.png
new file mode 100644
index 0000000000..b9563c7ac7
--- /dev/null
+++ b/doc/sl-logo.png
Binary files differ