0fe36daf56
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56631 svn+ssh://svn.lindenlab.com/svn/linden/branches/abstract-kdu@56647 --ignore-ancestry
2007-01-10 21:54:56 +00:00
8c344f4da0
svn merge -r 56560:56599 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-01-09 20:19:31 +00:00
8534623734
Showstopper merge from maintenance
...
svn merge -r 56564:56570 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
NOTE: This skips -r 56560:56464 which should be merged after being QA'd
2007-01-08 21:58:33 +00:00
fbf49910f3
svn merge -r 56431:56560 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-01-08 21:43:30 +00:00
c618a55f76
svn merge -r 56262:56561 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-1
...
Reviewed by doug. This code is running on Agni, but needed to merge into doug's new nightly stuff.
2007-01-08 20:02:51 +00:00
30c9f26561
Use actual planned license header (GPL, FLOSS exception, alternative available)
...
Add floss exception doc
2007-01-06 01:31:14 +00:00
3be8a9cc11
Result of svn merge -r56461:56474 svn+ssh://svn/svn/linden/branches/llscene-shuffle into release.
2007-01-04 23:38:26 +00:00
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
0434d35c16
Adding doc directory, with GPL license in it. Adding missing libopenjpeg.a for
...
Darwin release.
2007-01-04 02:00:37 +00:00
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
2b291c2732
svn merge -r 54741:56417 svn+ssh://svn.lindenlab.com/svn/linden/branches/andrew
...
Picking up some interestlist cleanup that passed testing.
2007-01-03 19:16:05 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Jon Wolk