diff options
author | Oz Linden <oz@lindenlab.com> | 2013-04-01 09:34:41 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-04-01 09:34:41 -0400 |
commit | 90b56ee9fa95ca8cc15e3abc81977f504eb32c5b (patch) | |
tree | 581e4ba644ebf770dbdab292ea9f10d4b9404cb6 /indra/newview/llfloaternamedesc.cpp | |
parent | 130e4e510198147664a2377b62b22d8e42f00f04 (diff) | |
parent | 49bef4e122e3ab4c82962e25f4ec1803c4e0c600 (diff) |
merge changes for 3.5.0-beta7
Diffstat (limited to 'indra/newview/llfloaternamedesc.cpp')
0 files changed, 0 insertions, 0 deletions