summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/textures/toolbar_icons
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2014-06-23 16:58:35 -0400
committerMonty Brandenberg <monty@lindenlab.com>2014-06-23 16:58:35 -0400
commit053f436413c01e237accabace4dc5ff1eccca837 (patch)
tree2440fa312a2f005c0d60705445c20b70e3844393 /indra/newview/skins/default/textures/toolbar_icons
parentc7057ef56efc1cca5683ca22e2ad410198d131e8 (diff)
parentd16e1b1b555e5b39456ec6b014f81ad663adc8d7 (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/skins/default/textures/toolbar_icons')
-rw-r--r--indra/newview/skins/default/textures/toolbar_icons/facebook.pngbin2974 -> 424 bytes
-rwxr-xr-xindra/newview/skins/default/textures/toolbar_icons/mini_cart.pngbin2987 -> 474 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/toolbar_icons/facebook.png b/indra/newview/skins/default/textures/toolbar_icons/facebook.png
index b960b834dc..ae524b643f 100644
--- a/indra/newview/skins/default/textures/toolbar_icons/facebook.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/facebook.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/toolbar_icons/mini_cart.png b/indra/newview/skins/default/textures/toolbar_icons/mini_cart.png
index 9fcf46794d..9eeb1d4e09 100755
--- a/indra/newview/skins/default/textures/toolbar_icons/mini_cart.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/mini_cart.png
Binary files differ