Steven Bennetts
|
941cb9f412
|
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
|
2008-04-01 17:45:04 +00:00 |
|
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 |
|
Christian Goetze
|
7b7dd4e6f6
|
svn merge -r74808:74832 svn+ssh://svn/svn/linden/branches/qa-dpo-9a
|
2007-12-01 01:29:28 +00:00 |
|
Kyle Machulis
|
2e7c0d973e
|
svn merge -r74104:74124 svn+ssh://svn/svn/linden/branches/crash-logger-cleanup-merge-6
|
2007-11-20 23:42:48 +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 |
|
Aaron Brashears
|
4942a7b779
|
Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
|
2007-10-04 16:31:48 +00:00 |
|
Don Kjer
|
13c391f198
|
EFFECTIVE MERGE: svn merge -r 68118:68999 svn+ssh://svn/svn/linden/branches/maintenance
ACTUAL MERGE: svn merge -r 69685:69687 svn+ssh://svn/svn/linden/branches/release-r69649-maintenance-sync
EQUIVALENT TO: svn merge -r 68118:69663 svn+ssh://svn/svn/linden/branches/maintenance-r68999
|
2007-09-14 21:13:20 +00:00 |
|
Christian Goetze
|
ce0a5fe145
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
Actual action: branched maintenance-r68118, merged in release, then copied result into release
|
2007-08-21 22:17:53 +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 |
|
Tess Chu
|
57b8fef824
|
svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
|
2007-07-11 21:29:02 +00:00 |
|
Kelly Washington
|
e03bb0606a
|
merge -r62831:64079 branches/maintenance to release
|
2007-06-21 22:40:22 +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 |
|
Kelly Washington
|
3e9872a297
|
merge -r61423:62602 svn/branches/maintenance --> release
|
2007-05-30 17:39:09 +00:00 |
|
Don Kjer
|
1c909afe39
|
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-05-02 21:24:47 +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 |
|
Josh Bell
|
0277259455
|
svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-04-11 17:54:18 +00:00 |
|
Karen Clark
|
fceae96eb1
|
svn merge -r59459:59476 svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release.
|
2007-03-20 22:21:42 +00:00 |
|
Aaron Brashears
|
5cc44523f7
|
Result of svn merge -r57350:57790 svn+ssh://svn/svn/linden/branches/os-patches.001 into release.
|
2007-02-09 23:35:12 +00:00 |
|
Mark Lentczner
|
d0d4670f49
|
merge in of error-refactor-3
concludes (fixes) SL-31187
pair programmed and reviewed by markl and karen
|
2007-02-06 00:57:33 +00:00 |
|
Steven Bennetts
|
77f04c74eb
|
merge -r 57517:57620 maintenance.
|
2007-02-05 21:13:38 +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 |
|
James Cook
|
47576ad1f7
|
SL-32769 Scripts now reliably register to receive email on region startup, we establish trust between dataserver and simulator explicitly on startup, reviewed by Kelly.
|
2007-01-19 00:39:03 +00:00 |
|
Steven Bennetts
|
71d28bdbf0
|
merge release@56803 release-candidate@56833
|
2007-01-17 23:02:00 +00:00 |
|
Aaron Brashears
|
4617a37edf
|
corrected, removed, and updated comments throughout the code to be more useful. no code changes. SL-13762
|
2007-01-03 21:05:41 +00:00 |
|
James Cook
|
420b91db29
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |