summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-02-28 11:05:33 -0500
committerLoren Shih <seraph@lindenlab.com>2011-02-28 11:05:33 -0500
commitdc3823b62936961edad12aab605ce868ff5ce6ea (patch)
treefe9eeaa176ab52f9b524db304dffe7a4a80085ca /doc
parent3ce756e44cca0cf6f9860871789e348647800e45 (diff)
parent9962560f57eb4bcf1b3451f5d86c963d5d6fcf5c (diff)
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 9a7ce92448..43e5591ab1 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -394,10 +394,15 @@ Jonathan Yap
STORM-812
STORM-829
STORM-844
+ STORM-953
+ STORM-960
STORM-869
+ STORM-974
+ STORM-975
+ STORM-979
+ STORM-980
VWR-17801
VWR-24347
- STORM-975
Kage Pixel
VWR-11
Ken March