summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-09-11 12:13:48 -0400
committerNat Goodspeed <nat@lindenlab.com>2012-09-11 12:13:48 -0400
commitf8207208f07b7e239ee9bdaf4b45838d3b595c40 (patch)
tree28511cb63b958282e794631756b554853dd35d9f /doc
parenta8aa7dbd8b64113573ee33ee7c267f17b26c3c39 (diff)
parent695c4135ff6fa0c50daa4c84f23096096ffd8a54 (diff)
Merge up to 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