summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorprep@lindenlab.com <prep@lindenlab.com>2013-03-20 17:53:51 -0500
committerprep@lindenlab.com <prep@lindenlab.com>2013-03-20 17:53:51 -0500
commitf2948cb1eb8866716a84868cccbfafcd742c0771 (patch)
tree394df20f229f87428252c02d2402c511b9fa7aa8 /doc
parent779e132cbfc46a0eda97a0331e39cbc6e686c07b (diff)
parent4a2fb4c64f2079089b78202e53bbe1dbe8ac09c7 (diff)
Merge with viewer-chui
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 10c935f9bb..32dd3c1a2e 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -744,6 +744,7 @@ Marc Claridge
Marc2 Sands
Marianne McCann
Marine Kelley
+ CHUIBUG-134
STORM-281
MartinRJ Fayray
STORM-1844