summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/textures/icons
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-03-24 16:51:07 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-03-24 16:51:07 -0700
commitda407e32fdb68e5aecff99c970d654293e21d0d9 (patch)
tree95ed03c2d77c1ef2920cd940345f70ab32bcf97d /indra/newview/skins/default/textures/icons
parent7480e069349e2b3a7581267d13f52c63e459af64 (diff)
parent7857f59f9e7c673f1ddbf32d6a66e85f78004445 (diff)
Merge
Diffstat (limited to 'indra/newview/skins/default/textures/icons')
-rw-r--r--indra/newview/skins/default/textures/icons/Inv_Object_Multi.pngbin0 -> 774 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/SL_Logo.pngbin973 -> 3999 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/icons/Inv_Object_Multi.png b/indra/newview/skins/default/textures/icons/Inv_Object_Multi.png
new file mode 100644
index 0000000000..11f4871ad8
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Inv_Object_Multi.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/SL_Logo.png b/indra/newview/skins/default/textures/icons/SL_Logo.png
index c9fbde987a..8342d7cfee 100644
--- a/indra/newview/skins/default/textures/icons/SL_Logo.png
+++ b/indra/newview/skins/default/textures/icons/SL_Logo.png
Binary files differ