summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-11-08 14:23:34 -0600
committerDave Parks <davep@lindenlab.com>2012-11-08 14:23:34 -0600
commitccad8c9411977287f1c42b288bf796308de81094 (patch)
treed114771df8469e4c9df6a9ecdd22edcbba7f24a0 /doc
parentc431ddf629b7f1149c44b2063d216dd34bcd2b12 (diff)
parent2126cdb9a25da4dcc4c81659038b85bcff17c4ee (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-lion
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 43de729bff..d29d7ce464 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -321,6 +321,7 @@ Dale Glass
VWR-1358
VWR-2041
Darien Caldwell
+ SH-3055
Dartagan Shepherd
Debs Regent
Decro Schmooz
@@ -890,6 +891,8 @@ Nicholaz Beresford
VWR-2682
VWR-2684
Nick Rhodes
+NickyD
+ MAINT-873
Nicky Perian
OPEN-1
STORM-1087
@@ -1243,6 +1246,7 @@ Westley Streeter
Whimsy Winx
Whirly Fizzle
STORM-1895
+ MAINT-873
Whoops Babii
VWR-631
VWR-1640