summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorBryan O'Sullivan <bos@lindenlab.com>2008-06-02 21:14:31 +0000
committerBryan O'Sullivan <bos@lindenlab.com>2008-06-02 21:14:31 +0000
commit9db949eec327df4173fde3de934a87bedb0db13c (patch)
treeaeffa0f0e68b1d2ceb74d460cbbd22652c9cd159 /doc
parent419e13d0acaabf5e1e02e9b64a07648bce822b2f (diff)
svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers
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 2799cd80e4..2a37015b01 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -117,6 +117,7 @@ Farallon Greyskin
Feep Larsson
VWR-447
VWR-1314
+ VWR-4444
Fremont Cunningham
VWR-1147
Gudmund Shepherd
@@ -194,6 +195,7 @@ Michelle2 Zenovka
VWR-2652
VWR-2834
VWR-3749
+ VWR-4506
Mm Alder
VWR-3777
VWR-4794