summaryrefslogtreecommitdiff
path: root/indra/newview/skins/minimal/textures/textures.xml
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2011-03-19 16:29:32 -0400
committerJonathan Yap <none@none>2011-03-19 16:29:32 -0400
commitfbd241da54ad6017825b59c5b0c71086d8b8957a (patch)
tree34051dba97afece2416f25954080011d922d910e /indra/newview/skins/minimal/textures/textures.xml
parent834d0f1ed612c8644e642103096daf7f0b0f44c9 (diff)
parent1a7369408c0b2cd15dbdc79d045f3347a8ab47d1 (diff)
STORM-1019 Resolve merge conflicts
Diffstat (limited to 'indra/newview/skins/minimal/textures/textures.xml')
-rw-r--r--indra/newview/skins/minimal/textures/textures.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/skins/minimal/textures/textures.xml b/indra/newview/skins/minimal/textures/textures.xml
new file mode 100644
index 0000000000..3e2f5cd397
--- /dev/null
+++ b/indra/newview/skins/minimal/textures/textures.xml
@@ -0,0 +1,8 @@
+
+<textures version="101">
+ <texture name="Button_Separator" file_name="bottomtray/button_separator.png" preload="true" />
+ <texture name="arrow_keys.png"/>
+ <texture name="bottomtray_close_off" file_name="bottomtray/close_off.png" preload="true" />
+ <texture name="bottomtray_close_over" file_name="bottomtray/close_over.png" preload="true" />
+ <texture name="bottomtray_close_press" file_name="bottomtray/close_press.png" preload="true" />
+</textures>