diff options
author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-06-23 17:58:51 -0700 |
---|---|---|
committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-06-23 17:58:51 -0700 |
commit | 9b86d4c12f5f29d0bca5354d4e1ac6b5c828a327 (patch) | |
tree | 8817ac78ec94cbb3938d6932cb164acadee406d8 /indra/newview/llvoavatardefines.cpp | |
parent | 85e326e7c74268fec4902b9b8b33a310f8c49a42 (diff) |
Removed conflict markers (ie. <<<<<<<) in llmessage/CMakeLists.txt
Copied snprintf declaration in llstring from login-api-3
Diffstat (limited to 'indra/newview/llvoavatardefines.cpp')
0 files changed, 0 insertions, 0 deletions