summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-11-19 17:03:05 -0500
committerOz Linden <oz@lindenlab.com>2010-11-19 17:03:05 -0500
commit3337ef16cee97e26b45aa07518d34d031bdc75fa (patch)
treeb3302fdbae8802ac4d209c960a5b9629938182f2 /doc
parent2eec4949cc49f3c59cdc278be0e7eed1e092b167 (diff)
parentf6ba55b8ed24246be340d069c64d25bd614194a6 (diff)
Automated merge with file:///Users/oz/Work/viewer-development
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index b255ca98cd..adfee2cce9 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -355,6 +355,7 @@ Joghert LeSabre
VWR-64
Jonathan Yap
VWR-17801
+ STORM-616
Kage Pixel
VWR-11
Ken March