summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-10-31 16:26:09 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-10-31 16:26:09 -0400
commit09179d1346ccf2fa07b2dec6a72592beb3bd262f (patch)
tree86b28bc6c0322a9abe9721dd0a0aa6e104487926 /doc
parent0f9dc968cfb702eba595213bbecd34375bd048c5 (diff)
parentf18cfe97750cc13374adab15636532fe0fbda19c (diff)
merge viewer-development to mesh-development
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 988410701b..d719f64baf 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -480,6 +480,7 @@ Ima Mechanique
OPEN-50
OPEN-61
OPEN-76
+ STORM-959
STORM-1175
Imnotgoing Sideways
Inma Rau
@@ -654,6 +655,8 @@ Lilly Zenovka
Lizzy Macarthur
Luban Yiyuan
Luc Starsider
+Luminous Luminos
+ STORM-959
Lunita Savira
Maccus McCullough
maciek marksman