diff options
| author | Robert Knop <prospero@lindenlab.com> | 2009-04-09 00:20:15 +0000 |
|---|---|---|
| committer | Robert Knop <prospero@lindenlab.com> | 2009-04-09 00:20:15 +0000 |
| commit | fa121d8ee18978ffc25e9faeffcfa1d7c6e1592e (patch) | |
| tree | 2fbe5f4a61cef96b932b198480991ea913daeca1 /doc/FLOSS-exception.txt | |
| parent | 2768539bfe2bf8f2d370fcef03ae7f15b55e0579 (diff) | |
svn merge -r115000:116937 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
Merging from server-1.26 to trunk
Only a few conflicts:
scripts/farm_distribute : the upload rate in trunk was even more
conservative than the one I switched to in
1.26, so kept the trunk version.
indra/llcommon/llversionserver.h : did svn revert to keep trunk
indra/newsim/lltask.cpp : svn is weird. The merge conflict was one
that it's not obvious why it was there.
However, Simon and I looked at it, and the
solution was obvious : keep the trunk blob
where the conflict was flagged.
indra/lib/python : conflict was differing versions of the eventlib
extern. did svn revert . to keep trunk.
Diffstat (limited to 'doc/FLOSS-exception.txt')
0 files changed, 0 insertions, 0 deletions