summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-05-12 13:20:09 -0700
committerRichard Linden <none@none>2011-05-12 13:20:09 -0700
commit4e02747908a00a2e6103e7a923e522aed0e22ada (patch)
tree94ad4f0ffd6a2e4559c267661d8ac36c70aefb86 /indra/newview/app_settings/settings.xml
parent506646b4d0619ed66cf0df481112300bc47c0ab8 (diff)
parente18f200243b5d9e5adba244634ecdaa4ac7da8dc (diff)
Automated merge with bundle:F:\code\viewer-experience-merge+c:\users\richard\appdata\local\temp\thg.7nrmxq\ssh__richard@hg.lindenlab.com_richard_viewer-experience_gittck.hg
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
0 files changed, 0 insertions, 0 deletions