summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAdam Moss <moss@lindenlab.com>2009-06-20 09:17:56 +0000
committerAdam Moss <moss@lindenlab.com>2009-06-20 09:17:56 +0000
commit8ed056fde9fe5fc9755158013a5cb8be73066e2c (patch)
treed7f5f6de35c99ca645e48dc8817d908cc6d2f348 /doc
parent351ebe9fcb76f3b99c2957004bb8493a904869ee (diff)
svn merge -r124872:124873
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.threefour-merge-1a QAR-1592 Merge of changes between 1.23 RC2 and 1.23 Final to trunk
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 31ea1bbc5b..28c41debe7 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -197,6 +197,7 @@ Feep Larsson
VWR-4444
Flemming Congrejo
CT-193
+ CT-318
Fluf Fredriksson
VWR-3450
Fremont Cunningham
@@ -350,6 +351,7 @@ Michelle2 Zenovka
Mm Alder
VWR-3777
VWR-4794
+ VWR-13578
Mr Greggan
VWR-445
Nicholaz Beresford