livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
85 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
Josh Bell ffc6680d95 Merge of final upload-queue changes from Branch_1-13-4 --> release 
svn merge -r 59496:59497 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-4 --> release
svn merge -r 59530:59531 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-4 --> release
svn merge -r 59827:59828 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-4 --> release
svn merge -r 59315:59316 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

In order, that's:
* back out upload-queue
* apply a subset
* apply the full thing
* re-merge the addition of the DELETE REST

Most of which turns into a no-op. Reviewed by don.
 		2007-03-30 17:23:42 +00:00
doc svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-03-21 19:36:11 +00:00
indra Merge of final upload-queue changes from Branch_1-13-4 --> release 2007-03-30 17:23:42 +00:00
scripts SL-38184 Make python scripts in linden/scripts run in place without PYTHONPATH or symlinks. Reviewed with Donovan. 2007-03-22 20:29:41 +00:00