Jon Wolk
|
7dd08303a3
|
svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134
|
2007-12-19 00:56:59 +00:00 |
|
Steven Bennetts
|
050dad0ce3
|
merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079
|
2007-11-07 22:55:27 +00:00 |
|
Jon Wolk
|
94bcd2c47d
|
svn merge -r 71902:71933 svn+ssh://svn.lindenlab.com/svn/linden/branches/expire-group-voice-channels -> release. Reverted 2 changes from the merge that were useless code.
|
2007-10-22 18:17:47 +00:00 |
|
Christian Goetze
|
5ec8bbbe22
|
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
|
2007-10-10 00:01:43 +00:00 |
|
Aaron Brashears
|
5595a99623
|
Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
|
2007-10-04 23:19:43 +00:00 |
|
Monroe Williams
|
7138fb673a
|
Merge down from Branch_1-18-1:
svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
|
2007-08-02 01:18:34 +00:00 |
|
Don Kjer
|
d373dcc7cb
|
svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release
* WARNING *: maintenance r64837 is not the last rev to use in the next merge. use r65269
|
2007-07-20 20:38:05 +00:00 |
|
Bryan O'Sullivan
|
ce7682c2a4
|
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
(only inside indra)
(josh) Original log message was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
bos updated it to be:
svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
However, it appears it actually was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
... missing some file additions.
|
2007-07-18 21:22:40 +00:00 |
|
Aaron Brashears
|
f118e7c80b
|
result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release
|
2007-06-13 18:02:37 +00:00 |
|
Don Kjer
|
4ecb9cb63e
|
svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release
|
2007-05-01 21:39:25 +00:00 |
|
Aaron Brashears
|
305c74d516
|
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
|
2007-02-02 17:28:58 +00:00 |
|
Josh Bell
|
fbf49910f3
|
svn merge -r 56431:56560 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
|
2007-01-08 21:43:30 +00:00 |
|
James Cook
|
420b91db29
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |