summaryrefslogtreecommitdiff
path: root/indra/llcommon/llsdserialize_xml.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-07-24 15:44:46 -0500
committerDave Parks <davep@lindenlab.com>2011-07-24 15:44:46 -0500
commita5769e81263d6d004033b914c1cbf1a8296923d9 (patch)
tree67f26cd98a492f0aff9d4ccb9a276221fdbc5e3a /indra/llcommon/llsdserialize_xml.cpp
parent0f86c26fa5c7c774e43189dd5ef5d68cb81e6dbf (diff)
terminating accidental merge
--HG-- branch : oops
Diffstat (limited to 'indra/llcommon/llsdserialize_xml.cpp')
0 files changed, 0 insertions, 0 deletions