summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAndrew Meadows <andrew@lindenlab.com>2010-09-13 09:16:49 -0700
committerAndrew Meadows <andrew@lindenlab.com>2010-09-13 09:16:49 -0700
commitc2f5bc0b129e0e0d2606a8e7849bbf37eb0276ea (patch)
treef139be7762d07c9b3331a3ff475a71c9156a6814 /doc
parenta6669cbd7905d75e5ff1ec596563bb6fad3c7642 (diff)
parent807aec7bafe19fca75a8f3980bd621fad7c8338e (diff)
Merge with http://hg.secondlife.com/viewer-development after migration
of Brad's simconsole work.
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 6edb727682..43b63569f1 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -68,6 +68,7 @@ Aleric Inglewood
SNOW-766
Ales Beaumont
VWR-9352
+ SNOW-240
Alissa Sabre
VWR-81
VWR-83
@@ -523,6 +524,8 @@ princess niven
CT-352
Renault Clio
VWR-1976
+resu Ampan
+ SNOW-93
Ringo Tuxing
CT-225
CT-226
@@ -584,6 +587,8 @@ Sergen Davies
CT-230
CT-231
CT-321
+Shawn Kaufmat
+ SNOW-240
SignpostMarv Martin
VWR-153
VWR-154
@@ -679,6 +684,7 @@ Whoops Babii
VWR-631
VWR-1640
VWR-3340
+ SNOW-667
VWR-4800
VWR-4802
VWR-4804