summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorSimon Linden <simon@lindenlab.com>2013-03-19 16:20:53 -0700
committerSimon Linden <simon@lindenlab.com>2013-03-19 16:20:53 -0700
commitd5561a1ada5cf171c8e281e910a7e989496c3705 (patch)
tree456cbb2374242d5508cc13165c876cd0672f6cd0 /doc
parenta8245c51b9cd6fac1d26932dbb1fcf052f00da18 (diff)
parent04e78ce4fdd3bbc0e4daa1daabbff2de1c425601 (diff)
Merge in viewer-beta to get CHUI code
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 0cd4067527..3abf32b8b1 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -746,6 +746,7 @@ Marc Claridge
Marc2 Sands
Marianne McCann
Marine Kelley
+ CHUIBUG-134
STORM-281
MartinRJ Fayray
STORM-1844