diff options
author | Josh Bell <josh@lindenlab.com> | 2007-09-13 18:17:52 +0000 |
---|---|---|
committer | Josh Bell <josh@lindenlab.com> | 2007-09-13 18:17:52 +0000 |
commit | b3d807d5ff8dca6c891e9a5e0ddc7bc147d69f8c (patch) | |
tree | 8b94c90d06bcd0ed5d258ab1e8c5d67024683cab /doc/contributions.txt | |
parent | a5f3ac2a8dc9aee2c04f24c3b3304c1b24808acb (diff) |
svn merge -r 68690:69597 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release
Merge patches made in the 1-18-3 RC iterations into the trunk.
NOTE: Includes the reversion of SL-51274 (originally maintenance r67559, changed lltracker.cpp)
Diffstat (limited to 'doc/contributions.txt')
-rw-r--r-- | doc/contributions.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 1ce46e5755..723a60312b 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -191,6 +191,7 @@ Strife Onizuka VWR-74 VWR-85 VWR-148 + VWR-2265 tenebrous pau VWR-247 TBBle Kurosawa |