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 |
|
Josh Bell
|
7afa8058aa
|
svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release
QAR-11: pair-reviewed the merge w/ Sam.
|
2007-11-01 22:02:35 +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 |
|
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
|
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 |
|
Josh Bell
|
98740db8fd
|
svn merge -r 59826:59968 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-04-04 19:49:24 +00:00 |
|
Josh Bell
|
b36dc36306
|
svn merge -r 58902:58986 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-09 01:09:20 +00:00 |
|
Steven Bennetts
|
4dabd9c047
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
Steven Bennetts
|
d4462963c6
|
merge -r 58503:58641 maintenance -> release
|
2007-03-02 19:11:06 +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
|
d60f16540d
|
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431
This turned up the following "lost" changes:
llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly
llfontgl.cpp (from maintenance r50207) - whitespace only
inventorybridge.cpp (property - non-executable)
skins/xui/*/* (from maintenance r55380) - XML processing instruction went AWOL
|
2007-01-04 02:04:29 +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 |