summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-12-13 14:57:40 -0500
committerOz Linden <oz@lindenlab.com>2012-12-13 14:57:40 -0500
commitc4c73fbcc6e7163f7b2dd3ab89a57c1ca5bcfc44 (patch)
tree427af8eac905a5856547c0f264453fc3124b84d8 /doc
parent874917106b5dadce90211e64d2526e173b3ecbf3 (diff)
parent35ef55b63fb7ee9a0e1b3cf257d27654c2cfd66d (diff)
merge changes for DRTVWR-266
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index f18985adcd..f53d9f5cfd 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 Dasmijn
VWR-29228
Nicky Perian
@@ -1059,9 +1062,12 @@ Shawn Kaufmat
SNOW-240
Sheet Spotter
Shnurui Troughton
+Shyotl Kuhr
+ MAINT-1138
Siana Gearz
STORM-960
STORM-1088
+ MAINT-1138
sicarius Thorne
Sicarius Toxx
SignpostMarv Martin
@@ -1243,6 +1249,7 @@ Westley Streeter
Whimsy Winx
Whirly Fizzle
STORM-1895
+ MAINT-873
Whoops Babii
VWR-631
VWR-1640