livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
696 Commits
2 Branches
0 Tags
319 MiB
C++ 86.4%
R 8%
GLSL 1.7%
HTML 1%
Python 0.9%
Other 1.9%
 
 
 
 
 
 
Go to file
Robert Knop fa121d8ee1 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.
 		2009-04-09 00:20:15 +00:00
doc svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge 2009-03-13 21:28:40 +00:00
etc Result of svn merge -r115023:115025 svn+ssh://svn/svn/linden/branches/no_free_uploads/merge_qa_2 into svn+ssh://svn/svn/linden/trunk for QAR-1220 2009-03-24 19:13:58 +00:00
indra svn merge -r115000:116937 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 2009-04-09 00:20:15 +00:00
scripts svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 2009-03-20 20:00:47 +00:00
install.xml Move some viewer artwork into a downloadable package. 2009-03-31 20:37:06 +00:00