summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-05-18 09:46:28 -0400
committerOz Linden <oz@lindenlab.com>2011-05-18 09:46:28 -0400
commit2de13f80707d81f15234f3828fb338164e724a13 (patch)
treed1fdaa5b0929380a380739f74983b5a0919e0407 /doc
parent4297b530d3f174bfeeb27c63d4ad3ef5192e755e (diff)
parent4d2a64c4a408538ac795afc0bd1fd8e345bf2708 (diff)
merge changes for storm-1259
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 163667c8ad..3b4f4de90e 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -254,6 +254,8 @@ Dale Glass
VWR-2502
VWR-1358
VWR-2041
+Draconis Neurocam
+ STORM-1259
Drew Dri
VWR-19683
Drewan Keats
@@ -435,6 +437,7 @@ Jonathan Yap
STORM-956
STORM-1095
STORM-1236
+ STORM-1259
Kage Pixel
VWR-11
Ken March