summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMark Palange <palange@lindenlab.com>2009-01-13 03:46:56 +0000
committerMark Palange <palange@lindenlab.com>2009-01-13 03:46:56 +0000
commit446c55538e1fb12d8a1feb541edf99c16bb29121 (patch)
tree022ca3c10bd2e0326098719cdffb65f9465ab08f /doc
parent5476aca88e4b34d4d145f3a0b04fce95402c7b1f (diff)
svn merge -r106055-107012 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/
merge RC5 changes into trunk, plus add'l localization xml (all newly added) files that should have been added with RC0-RC4 merge, but weren't.
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 42ee00f952..fb3f7ea466 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -149,6 +149,7 @@ Fremont Cunningham
VWR-1147
Geneko Nemeth
CT-117
+ VWR-11069
Gigs Taggart
SVC-493
VWR-6