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
|
e5124431b5
|
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-02 17:10:30 +00:00 |
|
Josh Bell
|
e61a10ec5b
|
svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-06-04 18:46:59 +00:00 |
|
Kelly Washington
|
3e9872a297
|
merge -r61423:62602 svn/branches/maintenance --> release
|
2007-05-30 17:39:09 +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 |
|
Steven Bennetts
|
d4462963c6
|
merge -r 58503:58641 maintenance -> release
|
2007-03-02 19:11:06 +00:00 |
|
Josh Bell
|
8c344f4da0
|
svn merge -r 56560:56599 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
|
2007-01-09 20:19:31 +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 |