summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2011-04-08 15:58:11 -0400
committerNyx (Neal Orman) <nyx@lindenlab.com>2011-04-08 15:58:11 -0400
commit2deea74cf6f08376e14e2f7e5333fc6959d2af19 (patch)
tree80429812cfb4f88a151627830dceb4a8f2e278dd /doc
parent534ac19ed5a6abe68ea654a5444b7e486f8ce06a (diff)
parent8807496ed78b36658f488d901842852d63f73cb9 (diff)
merging mesh-development into nyx's mesh development
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 3b1abcebed..c80ccea8ac 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -411,9 +411,10 @@ Jonathan Yap
VWR-17801
VWR-24347
STORM-975
- STORM-990
+ STORM-1019
STORM-1020
STORM-1064
+ STORM-1077
Kage Pixel
VWR-11
Ken March
@@ -643,6 +644,7 @@ Robin Cornelius
SNOW-747
STORM-422
STORM-960
+ STORM-1019
VWR-2488
VWR-9557
VWR-10579