diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-03-30 17:23:42 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-03-30 17:23:42 +0000 |
| commit | ffc6680d956069625fc1fe5da133bdf7922cea83 (patch) | |
| tree | dbf0ec81a057e87ba1e19dc1f320ed9989104673 /indra/newview/llviewerwindow.cpp | |
| parent | f01a90050fcf650b5655f494fff22e265b3ec312 (diff) | |
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.
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
0 files changed, 0 insertions, 0 deletions