summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2011-03-23 01:26:03 +0000
committerDon Kjer <don@lindenlab.com>2011-03-23 01:26:03 +0000
commit1e0608ff51efc69a14010f2ce5dba3acabe16e49 (patch)
tree326e829b4233658ba8698e06ff17267618e93a62 /doc
parentbecc9d09970755f9cc0d95c46b9f2d81d5b856b5 (diff)
parente4a4d75104916968ce03337094b1194e0daff438 (diff)
Merge with 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 4c2a836b4c..560bedd518 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -412,6 +412,7 @@ Jonathan Yap
STORM-975
STORM-990
STORM-1020
+ STORM-1064
Kage Pixel
VWR-11
Ken March