summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-11-06 15:09:00 -0500
committerNat Goodspeed <nat@lindenlab.com>2012-11-06 15:09:00 -0500
commit6ad37da1aa0ae4130f33943c0f87bbdcf1a69c38 (patch)
tree0ae02b9f3839e2eb327e33c1b6f7802a08c843f7 /doc
parentbf6d1670756ba96abde570e7dbbf94c62c71ca5b (diff)
parent379bc7bd1db5a728a730f7e0e7d0a3bfbdfc3870 (diff)
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index e20b7b83c5..cf9cc032ae 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -890,6 +890,8 @@ Nicholaz Beresford
VWR-2682
VWR-2684
Nick Rhodes
+Nicky Dasmijn
+ VWR-29228
Nicky Perian
OPEN-1
STORM-1087
@@ -1122,6 +1124,7 @@ TankMaster Finesmith
STORM-1602
STORM-1868
VWR-26622
+ VWR-29224
Talamasca
Tali Rosca
Tayra Dagostino