summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-05-19 12:07:41 -0400
committerOz Linden <oz@lindenlab.com>2011-05-19 12:07:41 -0400
commit78cad5181839c530f32c7e50791933dc00a3df6d (patch)
tree9648f16aa8297f6523995337ddb2ed50aa2330d9 /doc
parent196b4d5704e4284bdeca54362a09a4c1b33cbf5e (diff)
parenta461aedf2e3495ccbce4c74f7e7f9d8aed90adc0 (diff)
merge changes for STORM-1259 and STORM-1175
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 1e30188559..d6890df1e1 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -255,6 +255,8 @@ Dale Glass
VWR-2502
VWR-1358
VWR-2041
+Draconis Neurocam
+ STORM-1259
Drew Dri
VWR-19683
Drewan Keats
@@ -368,6 +370,7 @@ Ian Kas
Ima Mechanique
OPEN-50
OPEN-61
+ STORM-1175
Irene Muni
CT-324
CT-352
@@ -436,6 +439,7 @@ Jonathan Yap
STORM-956
STORM-1095
STORM-1236
+ STORM-1259
Kage Pixel
VWR-11
Ken March
@@ -453,6 +457,7 @@ Kitty Barnett
STORM-799
STORM-800
STORM-1001
+ STORM-1175
VWR-24217
Kunnis Basiat
VWR-82