summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2007-12-28 22:19:29 +0000
committerJames Cook <james@lindenlab.com>2007-12-28 22:19:29 +0000
commit79680891a73be074aa449a9ccdf695b0afd300d8 (patch)
tree5744f638cdd252fc21278bc11c1772dc7c64ef06 /doc
parent9d0d9f786046fbc866be37ea772a0e7a49080da3 (diff)
svn merge -r 76394:76651 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer to pick up LLURI escaping fix and all other changes since last sync. Not reviewed.
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 4d2584f1eb..0c360e7f84 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -33,6 +33,7 @@ Alissa Sabre
VWR-1410
VWR-2116
VWR-2826
+ VWR-4010
Angus Boyd
VWR-592
Argent Stonecutter
@@ -151,6 +152,8 @@ Kage Pixel
Kunnis Basiat
VWR-82
VWR-102
+march Korda
+ SVC-1020
Matthew Dowd
VWR-1344
VWR-1736