summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorKitty Barnett <develop@catznip.com>2012-12-18 21:57:25 +0100
committerKitty Barnett <develop@catznip.com>2012-12-18 21:57:25 +0100
commitc309a7bd9446cc942830998b1f5873cc62e9dffb (patch)
treebbfe0d41ebc7e303db1bd95c419f604e04fb9ab2 /doc
parentca790f7320c9fc6c43e8c6022c9e511a85fd1c9d (diff)
parent3feacc96c6cf87f1be034312d8c71d21bae88351 (diff)
Merge with viewer-materials tip
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