summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-21 07:00:20 -0400
committerOz Linden <oz@lindenlab.com>2011-03-21 07:00:20 -0400
commitd3023153e9c7aa2eaf18468e8d81aebf0d6223e0 (patch)
treef1265d15e702f1dd449476fd5e7b956ccd7f33f8 /doc
parent7766d424d0f8cf8a6c882f50bc4dd04bf8f2096b (diff)
parentcb47ae3264f3d9d22add17f2cbc5699c8620705f (diff)
merge changes for storm-1035
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