diff options
author | Oz Linden <oz@lindenlab.com> | 2014-07-21 14:41:29 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-07-21 14:41:29 -0400 |
commit | 83d5f20b1cbd29a86090f40b1dcc9236f15ca249 (patch) | |
tree | 4b709f66c7d6ec9195327c4d0ae9a97b10fc0add /indra/newview/skins/default/textures/toolbar_icons | |
parent | 532433674c9553636af9ea8d433b9da6d6fae587 (diff) | |
parent | 29bea5a6b94458e23559bdbeaae5a593100533b6 (diff) |
merge changes for 3.7.12-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 |