summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/textures/world
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/world
parentc7057ef56efc1cca5683ca22e2ad410198d131e8 (diff)
parentd16e1b1b555e5b39456ec6b014f81ad663adc8d7 (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/skins/default/textures/world')
-rwxr-xr-xindra/newview/skins/default/textures/world/CameraDragDot.pngbin3101 -> 563 bytes
-rwxr-xr-xindra/newview/skins/default/textures/world/NoEntryLines.pngbin3523 -> 1265 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/world/CameraDragDot.png b/indra/newview/skins/default/textures/world/CameraDragDot.png
index 57698e1956..2ccf098e0f 100755
--- a/indra/newview/skins/default/textures/world/CameraDragDot.png
+++ b/indra/newview/skins/default/textures/world/CameraDragDot.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/world/NoEntryLines.png b/indra/newview/skins/default/textures/world/NoEntryLines.png
index 18e270bde5..d7496b8bd0 100755
--- a/indra/newview/skins/default/textures/world/NoEntryLines.png
+++ b/indra/newview/skins/default/textures/world/NoEntryLines.png
Binary files differ