Kelly Washington
|
3e9872a297
|
merge -r61423:62602 svn/branches/maintenance --> release
|
2007-05-30 17:39:09 +00:00 |
|
Don Kjer
|
70aaa3e444
|
svn merge -r 61148:61343 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-05-04 21:57:06 +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 |
|
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 |
|
Richard Nelson
|
3ac41f9172
|
fix for crash in debug mode when in renderGlyph()
reviewed by davep
|
2007-04-05 21:18:32 +00:00 |
|
Richard Nelson
|
2ce0fc5f18
|
svn merge -r 59234:60086 svn+ssh://svn/svn/linden/branches/live_lsl_help2 -> release
|
2007-04-05 00:59:55 +00:00 |
|
Josh Bell
|
ea8fb7238e
|
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-31 01:41:19 +00:00 |
|
Josh Bell
|
c93c38e047
|
svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-21 19:36:11 +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 |
|
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 |
|
Josh Bell
|
7dada07dba
|
svn merge -r 57620:58007 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
|
2007-02-20 22:02:36 +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 |
|
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
|
aeb6d0c93c
|
svn merge -r 56599:56738 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
|
2007-01-15 18:49:02 +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 |