summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2011-08-31 11:15:02 -0600
committerXiaohong Bao <bao@lindenlab.com>2011-08-31 11:15:02 -0600
commit1379188c82a49617782288a61f1c3908d8738a3e (patch)
tree8a0c020aa8f6ab9ab2b62bfff01cd67e9c34bd32 /doc
parente62a4d4ec151e81f4dc68b29a009596d3d154d57 (diff)
parente547c36e2562589c120bb23ee88308e21a826cd1 (diff)
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt9
1 files changed, 5 insertions, 4 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 016aa0064a..dd18be4dcc 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -65,11 +65,15 @@ Aimee Trescothick
Alejandro Rosenthal
VWR-1184
Aleric Inglewood
+ SNOW-84
SNOW-240
+ SNOW-477
SNOW-522
SNOW-626
+ SNOW-744
SNOW-756
SNOW-764
+ SNOW-766
SNOW-800
VWR-10001
VWR-10579
@@ -95,11 +99,8 @@ Aleric Inglewood
VWR-24366
VWR-24519
VWR-24520
- SNOW-84
- SNOW-477
- SNOW-744
- SNOW-766
STORM-163
+ STORM-864
STORM-955
STORM-960
Ales Beaumont