summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-10-28 16:47:24 -0400
committerOz Linden <oz@lindenlab.com>2011-10-28 16:47:24 -0400
commitf49f6c8ef27bb73179f12d82401026ec2bb49155 (patch)
tree665a08d88dd7796aaf7b0d5a25847c8c257a1e5d /indra/newview/skins/default
parent749fbe7d514fcab82a8bb3f16ce793dccedbd542 (diff)
parent4fd9a53115bf85ffe17974323d5fa609e0df960c (diff)
merge changes for storm-959
Diffstat (limited to 'indra/newview/skins/default')
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/en/floater_model_preview.xml0
1 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index fbaf4f0a8a..fbaf4f0a8a 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml