summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-12-13 18:18:39 -0500
committerOz Linden <oz@lindenlab.com>2012-12-13 18:18:39 -0500
commit83299b56c4a9922a2dfa141f2ff45f3d52883c07 (patch)
tree9eb513f813ce4d17fa89c88388f66a73b52b4e1f /doc
parentedcdce226a7ff599e43c89fe7e4d37350650ae96 (diff)
parent9f1b484817840cc8f185090f2e8b7bdee441ea7a (diff)
merge fixes from 3.4.3-beta3
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