summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-12-16 11:12:15 -0500
committerLoren Shih <seraph@lindenlab.com>2010-12-16 11:12:15 -0500
commitee0055f5af672bef8402679fe8cc41717b0b9678 (patch)
treed2c025aa4d9469d98a0c8544e1634eedfbad0c84 /doc
parentad625861e120cae967d6bc60a9c1f4d86f4c2ed1 (diff)
parent73962e2134035855def0177db171d8eddaa193cb (diff)
Automated merge up from 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 35c2a403d5..7cf1b12bcd 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -608,6 +608,7 @@ Sammy Frederix
VWR-6186
Satomi Ahn
STORM-501
+ STORM-229
Scrippy Scofield
VWR-3748
Seg Baphomet