diff options
author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-09-09 11:08:51 -0400 |
---|---|---|
committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-09-09 11:08:51 -0400 |
commit | 1ed13a1c3f544110cd92eaefc563faa86a9c1c88 (patch) | |
tree | 387b2ab0f21ae659915eba58262727a79298dea9 /indra/newview/llfriendcard.h | |
parent | f45ca1ed6e6f3b5d8b7740e7c110841922d517ec (diff) | |
parent | 272b6fea1fad391b18924e63d1fee0b395ab165b (diff) |
Automated merge with http://bitbucket.org/seraph/viewer-development-shining
Diffstat (limited to 'indra/newview/llfriendcard.h')
0 files changed, 0 insertions, 0 deletions