summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-05-17 19:26:18 -0400
committerOz Linden <oz@lindenlab.com>2011-05-17 19:26:18 -0400
commit9075e1104fd8238991f42b90e51b77d3497db02a (patch)
treecaa4a8153ec4c340167f4fe8f438259748643485 /indra/newview/skins/default/xui
parentfe22feea99ba837076852078a4acddcb3e2a6f15 (diff)
fix merge error in open source configurations to disable proprietary components
Diffstat (limited to 'indra/newview/skins/default/xui')
0 files changed, 0 insertions, 0 deletions