summaryrefslogtreecommitdiff
path: root/indra/llmessage/llmessagetemplate.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-04-28 15:12:38 -0700
committerRichard Linden <none@none>2011-04-28 15:12:38 -0700
commit09594aa3d5510e5c7d9254277977cb0bdd418d2f (patch)
tree0523ef3b59d71f4068044d3d5e2fcd4efdc23bd4 /indra/llmessage/llmessagetemplate.cpp
parent363e296dde5fbd56f9bf4382285b162712d582e2 (diff)
parent1128a15f0be3e12104fdb49e0a3417ecea6faccb (diff)
Automated merge with bundle:E:\code\viewer-experience-merge+c:\users\richard\appdata\local\temp\thg.ia7ixc\http__hg.secondlife.com_viewer-development_csqen8.hg
Diffstat (limited to 'indra/llmessage/llmessagetemplate.cpp')
0 files changed, 0 insertions, 0 deletions