summaryrefslogtreecommitdiff
path: root/doc/contributions.txt
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-03-23 19:34:15 -0700
committerRichard Linden <none@none>2011-03-23 19:34:15 -0700
commitfdf63ba0753fcfc17aa6939836c7835787293b3c (patch)
treecd2bbbad8c1bd8b901a755b81f9cbb78f0bdee43 /doc/contributions.txt
parent501e282ee03e6d53c16c421d8b49f8bed3e74ef3 (diff)
parent9c82ea334ab0c1283f28997fe060b24200e3e2be (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social
Diffstat (limited to 'doc/contributions.txt')
-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