diff options
| author | Christian Goetze <cg@lindenlab.com> | 2009-07-29 22:16:52 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2009-07-29 22:16:52 +0000 |
| commit | 87776b19443030bece31c26290d1092bf6cbb3e6 (patch) | |
| tree | 63977aec653de4f89ff4819908573e08fedebce1 /indra/newview/llfloaterenvsettings.h | |
| parent | 2c31217cc97938fd4bc482a888410dec59f54ddb (diff) | |
svn merge -r128774:128808 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1737
effective merge: svn merge -r127126:128746 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.27
Diffstat (limited to 'indra/newview/llfloaterenvsettings.h')
0 files changed, 0 insertions, 0 deletions