diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-05-15 21:15:05 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-05-15 21:15:05 +0000 |
| commit | ba9d38e3dddea24b840cea3eae24cf37466260e1 (patch) | |
| tree | 6719a655c5c46f896a92bcd1e3d46ec9e70318e2 /indra/llcommon/llpreprocessor.h | |
| parent | 03748c42aef82e0b07ee4a79f360fe4c0b15389a (diff) | |
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
Diffstat (limited to 'indra/llcommon/llpreprocessor.h')
0 files changed, 0 insertions, 0 deletions