diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-11-05 08:33:31 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-11-05 08:33:31 -0500 |
commit | 6f6d1314e6f1fe12391391172bffa52c9c08e380 (patch) | |
tree | c1f6a05288d90c9b503db1b559662389971cf2e2 /indra/newview/skins/default/textures | |
parent | 42e4e37666d3827b5d2ceb77cb13bcdb93068c0c (diff) | |
parent | 5c2d187d6fb296876c2c3cba5817c749598f4283 (diff) |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/skins/default/textures')
-rw-r--r-- | indra/newview/skins/default/textures/icons/Inv_Alpha.png | bin | 0 -> 253 bytes |
-rw-r--r-- | indra/newview/skins/default/textures/icons/Inv_Tattoo.png | bin | 0 -> 253 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/icons/Inv_Alpha.png b/indra/newview/skins/default/textures/icons/Inv_Alpha.png Binary files differnew file mode 100644 index 0000000000..e8d246c6fa --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Inv_Alpha.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Tattoo.png b/indra/newview/skins/default/textures/icons/Inv_Tattoo.png Binary files differnew file mode 100644 index 0000000000..e8d246c6fa --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Inv_Tattoo.png |