diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2014-06-23 16:58:35 -0400 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2014-06-23 16:58:35 -0400 |
commit | 053f436413c01e237accabace4dc5ff1eccca837 (patch) | |
tree | 2440fa312a2f005c0d60705445c20b70e3844393 /indra/newview/skins/default/textures/toolbar_icons | |
parent | c7057ef56efc1cca5683ca22e2ad410198d131e8 (diff) | |
parent | d16e1b1b555e5b39456ec6b014f81ad663adc8d7 (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.png | bin | 2974 -> 424 bytes |
-rwxr-xr-x | indra/newview/skins/default/textures/toolbar_icons/mini_cart.png | bin | 2987 -> 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 Binary files differindex b960b834dc..ae524b643f 100644 --- a/indra/newview/skins/default/textures/toolbar_icons/facebook.png +++ b/indra/newview/skins/default/textures/toolbar_icons/facebook.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/mini_cart.png b/indra/newview/skins/default/textures/toolbar_icons/mini_cart.png Binary files differindex 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 |