summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-11-24 00:49:33 -0800
committerMerov Linden <merov@lindenlab.com>2010-11-24 00:49:33 -0800
commit744d23e3145eeca2c8db34b39cd1dc4bec24d3b1 (patch)
tree5d38f05222333ebb019b8d3fe3c6d287b69e13a9 /doc
parent44a6e5da2c76b16bb70a93ba9952bc338dce2e89 (diff)
parent2e47e4f303b9b4d9222cbf6310e0a887468e3109 (diff)
Merge from lindenlab/viewer-beta
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index adfee2cce9..d4e459039d 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -768,16 +768,16 @@ WolfPup Lowenhar
STORM-102
STORM-103
STORM-143
+ STORM-255
+ STORM-256
STORM-535
STORM-544
STORM-654
+ STORM-674
VWR-20741
VWR-20933
Zai Lynch
VWR-19505
-Wolfpup Lowenhar
- STORM-255
- STORM-256
Zarkonnen Decosta
VWR-253
Zi Ree