diff options
| author | Robert Knop <prospero@lindenlab.com> | 2009-01-22 23:53:36 +0000 |
|---|---|---|
| committer | Robert Knop <prospero@lindenlab.com> | 2009-01-22 23:53:36 +0000 |
| commit | 00b0498362a4fcbd12ed0cf4b5b80bfd9510edd5 (patch) | |
| tree | 6da919f837c048b222d1318eb143289f41e06396 /doc | |
| parent | 6a2fa3da87c438ccadebe461c1f320950789251c (diff) | |
Merging from production branch to trunk
svn merge -r108266:108604 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25
One merge conflict, in indra/backbone/agent_linden_dollar.py, which was
very small, and resolved by Kartic & Prospero.
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions