From b3d807d5ff8dca6c891e9a5e0ddc7bc147d69f8c Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Thu, 13 Sep 2007 18:17:52 +0000
Subject: 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)
---
 doc/contributions.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc')

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
-- 
cgit v1.2.3