summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-17 14:49:03 -0400
committerOz Linden <oz@lindenlab.com>2011-03-17 14:49:03 -0400
commit17d87b0fa5bdd8d15dbcd98e65c30ebf4e5b94ec (patch)
treed57dc022d32f0a5c362860add8c697cddbd6842e /doc
parenta024493c04aea26b523d52971ab9cc1c9df5d08b (diff)
parentd27a695b0be6c16e11a8c06c23d59e4107523ef6 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social
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