summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-04-01 16:42:46 -0700
committerRichard Linden <none@none>2011-04-01 16:42:46 -0700
commit88c5554a288d1785aa391dc5ff7b7897a7a724a9 (patch)
tree0305d5ce1f0bb5e544cd75275a137b372a08293d /doc
parent774b9ac9f9f87af65a7356d7f9a25e204428d4aa (diff)
parent453b0c700a8712f7ff79434772296a487d38184a (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social-2
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 212d6fdc57..8ddee2e86c 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -409,12 +409,13 @@ Jonathan Yap
VWR-17801
VWR-24347
STORM-975
- STORM-990
+ STORM-1019
STORM-844
STORM-643
STORM-1020
STORM-1064
STORM-960
+ STORM-1077
STORM-953
Kage Pixel
VWR-11
@@ -649,6 +650,7 @@ Robin Cornelius
SNOW-747
STORM-422
STORM-960
+ STORM-1019
VWR-2488
VWR-9557
VWR-10579