Josh Bell
|
ba9d38e3dd
|
Merge all of the patches made to Branch_1-15-1 back into release:
* Release notes for 1.15.1(3)
* Updated contributors list
* Revert apr libraries (NOTE: Also done in maintenance, this should be a no-op...)
* Fix for SL-42640 Entering appearance mode triggers "items coming too fast"
* Fix for SL-42257 Mute Resident button does not open the user picker
svn merge -r 61568:61569 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release
svn merge -r 61585:61586 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release
svn merge -r 61601:61602 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release
svn merge -r 61761:61762 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release
svn merge -r 61777:61778 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release
svn merge -r 61805:61806 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release
svn merge -r 61824:61825 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release
|
2007-05-15 21:15:05 +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 |
|
Adam Moss
|
208ccf8c2c
|
SL-24485, SL-40331, SL-23136, SL-40330, SL-25816, SL-40567,
SL-40568: land moss/linuxmisc-r60383: misc linuxclient & opensource
fixes.
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@60383
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/linuxmisc-r60383 ->
release
|
2007-04-18 09:17:53 +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
|
c93c38e047
|
svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-21 19:36:11 +00:00 |
|
Adam Moss
|
9d3309f684
|
SL-35314 - fix many openjpeg woes. QA'd.
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@58887
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/SL-35314-based-on-r58887
--> release
|
2007-03-16 11:39:49 +00:00 |
|
Josh Bell
|
00dbacb215
|
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@59161 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate@59163 --> release
|
2007-03-14 23:03:50 +00:00 |
|
Steven Bennetts
|
4dabd9c047
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +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 |
|
Rob Lanphier
|
54d89549df
|
Making sure there's license text distributed for the Linden Lab logos that makes it clear
we still are enforcing our trademarks
|
2007-02-01 06:39:06 +00:00 |
|
Jon Wolk
|
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 |
|
Rob Lanphier
|
30c9f26561
|
Use actual planned license header (GPL, FLOSS exception, alternative available)
Add floss exception doc
|
2007-01-06 01:31:14 +00:00 |
|
Rob Lanphier
|
0434d35c16
|
Adding doc directory, with GPL license in it. Adding missing libopenjpeg.a for
Darwin release.
|
2007-01-04 02:00:37 +00:00 |