summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2016-09-16 14:38:35 -0700
committerRider Linden <rider@lindenlab.com>2016-09-16 14:38:35 -0700
commit68b8d2658a741617ae9844824090efe922da1edd (patch)
tree2a277b2df2a44fc068d58954b14156f2031265b0 /indra/newview/skins/default
parent51236b7c9c2e74639be6360b42154f21fecc9df8 (diff)
MAINT-6570: Fix bad merge.
Diffstat (limited to 'indra/newview/skins/default')
0 files changed, 0 insertions, 0 deletions