diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-05 13:31:19 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-05 13:31:19 +0100 |
| commit | 84d073ad34443b5cdc213b380d7ceb9ef2f66600 (patch) | |
| tree | dbb88f7e20c6964e33b58f98081214850d9a99d4 /indra/newview/llnameeditor.cpp | |
| parent | 476f5e064ea327b1e3426ba2efb5971ced8ba9b0 (diff) | |
fix a merge conflict I forgot to commit earlier.
Diffstat (limited to 'indra/newview/llnameeditor.cpp')
0 files changed, 0 insertions, 0 deletions