summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerfloaterreg.cpp
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2011-10-05 13:37:39 -0700
committerRichard Nelson <richard@lindenlab.com>2011-10-05 13:37:39 -0700
commiteda12bd009d8f71eb82b6e6238335a172d6e5fb0 (patch)
tree310c42b30386bf35e7b97d2ebd212ac1323d2379 /indra/newview/llviewerfloaterreg.cpp
parent7ffa6ba854392d5c37de8631c7f35edeed375a58 (diff)
fixed bad xml merge
Diffstat (limited to 'indra/newview/llviewerfloaterreg.cpp')
0 files changed, 0 insertions, 0 deletions