summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-08-04 15:37:31 -0400
committerOz Linden <oz@lindenlab.com>2011-08-04 15:37:31 -0400
commit94c171d89bae06d0bc259255a917db892019c369 (patch)
tree7ad345f7accb18308d75367ed40326131d229cab /indra/newview/skins/default/xui/zh/panel_media_settings_general.xml
parent4ba18501ea2f8c45b2366b6caaeeb7c9ffe6038f (diff)
parent468d81048602d5369209ef2f945b63db381423eb (diff)
merge changes for storm-1355
Diffstat (limited to 'indra/newview/skins/default/xui/zh/panel_media_settings_general.xml')
0 files changed, 0 insertions, 0 deletions