summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-11-10 22:39:11 -0800
committerMerov Linden <merov@lindenlab.com>2010-11-10 22:39:11 -0800
commit0e07758b540374aa421d2938ce5ed13e2b9eefe4 (patch)
tree145600f9494489b686e13b53edc7f10d75afa0e3 /doc
parent4bbe823302427a705ea541d968f6058571a13c2f (diff)
parent61fbc02deb08c1a69b8c24498fe559359496ac91 (diff)
merge with STORM-105 and viewer-development
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 5d9a971b1e..79e8607f15 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -712,6 +712,8 @@ Thraxis Epsilon
VWR-383
tiamat bingyi
CT-246
+Tofu Buzzard
+ STORM-546
TraductoresAnonimos Alter
CT-324
Tue Torok