summaryrefslogtreecommitdiff
path: root/indra/newview/res
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2010-03-09 10:19:47 -0700
committerXiaohong Bao <bao@lindenlab.com>2010-03-09 10:19:47 -0700
commit6f5877e3e549fd42d0a973ccb19ade6a1ee2c392 (patch)
treee23b43adb942deef8bf4d42fa37550063c4d6981 /indra/newview/res
parentcaa1435ae0afa0e4ac2fe42fc8dc67dd93cdb524 (diff)
parent0a7fbb31d45d356b50899534ff6740097d5d3f22 (diff)
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/res')
0 files changed, 0 insertions, 0 deletions