summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAdam Moss <moss@lindenlab.com>2009-09-22 22:12:54 +0000
committerAdam Moss <moss@lindenlab.com>2009-09-22 22:12:54 +0000
commitd65c7b0f90acfbc88e94000a92703aad7413139e (patch)
treedba5589ca447e0fed570a674b6f85574cacdab6e /indra/newview
parent696b71938c36b4f5de4de47927a565c8b6bb404c (diff)
svn merge -c-134040 .
back-out my last commit - it fixed the build test, but the build still fails; I'll leave it alone...
Diffstat (limited to 'indra/newview')
0 files changed, 0 insertions, 0 deletions