diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:45:17 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:45:17 +0200 |
| commit | 098c4c0371f63b2b827131a13bfc623b8cb73f25 (patch) | |
| tree | 778bd8bc6f9a557fed93e040ea58c0b73bea0dbb /doc/sl-logo.png | |
| parent | d734105446182b17a91f6590eaa23ac690032817 (diff) | |
| parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) | |
Merge branch 'master' into DRTVWR-486
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llpanelvolume.cpp
# indra/newview/llpanelvolume.h
Diffstat (limited to 'doc/sl-logo.png')
| -rw-r--r-- | doc/sl-logo.png | bin | 0 -> 9630 bytes |
1 files changed, 0 insertions, 0 deletions
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 |