summaryrefslogtreecommitdiff
path: root/doc/contributions.txt
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-11-13 19:04:25 -0500
committerNat Goodspeed <nat@lindenlab.com>2012-11-13 19:04:25 -0500
commitb6b12d0ded7573397cdcf9284cff4c6f8937f726 (patch)
treeb1b2694a494701dfb808ddc310e54ac31b7feeca /doc/contributions.txt
parentbe210914f4e9081f021cc1ad3b671765aba79b61 (diff)
parentd65df92ef4719e0d4c98c5eafda9c7d19ae220c4 (diff)
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'doc/contributions.txt')
-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