diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2020-06-02 16:05:56 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2020-06-02 16:05:56 -0400 |
| commit | 50a8c2e41adf92f289fc7c6394908e0b04e130ca (patch) | |
| tree | fdee833b893eac17f04503b4423e681443c7aa0a /indra/newview/skins/default/textures/3p_icons | |
| parent | 1d8cbec4c8b6fdc09a2772c4bc98732927323570 (diff) | |
| parent | 1702a65665879d0c68df4c6b4fdb60f815ab7abb (diff) | |
DRTVWR-476: Merge branch 'master' of bitbucket.org:lindenlab/viewer into d476.
Diffstat (limited to 'indra/newview/skins/default/textures/3p_icons')
| -rw-r--r-- | indra/newview/skins/default/textures/3p_icons/fmod_logo.png | bin | 0 -> 14486 bytes |
| -rw-r--r-- | indra/newview/skins/default/textures/3p_icons/havok_logo.png | bin | 0 -> 41488 bytes |
| -rw-r--r-- | indra/newview/skins/default/textures/3p_icons/vivox_logo.png | bin | 0 -> 2331 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/3p_icons/fmod_logo.png b/indra/newview/skins/default/textures/3p_icons/fmod_logo.png Binary files differnew file mode 100644 index 0000000000..5a50e0ad34 --- /dev/null +++ b/indra/newview/skins/default/textures/3p_icons/fmod_logo.png diff --git a/indra/newview/skins/default/textures/3p_icons/havok_logo.png b/indra/newview/skins/default/textures/3p_icons/havok_logo.png Binary files differnew file mode 100644 index 0000000000..ff1ea3a72e --- /dev/null +++ b/indra/newview/skins/default/textures/3p_icons/havok_logo.png diff --git a/indra/newview/skins/default/textures/3p_icons/vivox_logo.png b/indra/newview/skins/default/textures/3p_icons/vivox_logo.png Binary files differnew file mode 100644 index 0000000000..6f20e87b7a --- /dev/null +++ b/indra/newview/skins/default/textures/3p_icons/vivox_logo.png |
