diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-20 12:41:00 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-20 12:41:00 +0100 |
| commit | f33fff7e15947859f9c89cd5297971a28205bca8 (patch) | |
| tree | 4abe6618d6bc69432707f23369587190d1ef544d /indra/newview/llfloaternamedesc.cpp | |
| parent | e275b7a658ee29ca4ce3dd77908ddd4c34749449 (diff) | |
| parent | 5952fbca316ba1d1e4243bf5ebd6dc647e4957f4 (diff) | |
slightly hairy merge from viewer-trunk
Diffstat (limited to 'indra/newview/llfloaternamedesc.cpp')
0 files changed, 0 insertions, 0 deletions