summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-07-07 13:34:13 -0700
committerRichard Linden <none@none>2011-07-07 13:34:13 -0700
commit88a90aabcb5bdede24bb451d443239e1e116c4ea (patch)
tree9399a4aefc1a9017986e1c29f9c9077d6e3c74c7 /doc
parent66dcc72870b19c6ada65a643ca33c779c9c9989b (diff)
parent8f7579e4e46bb8da9fece3125ae31c3bb885be96 (diff)
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt16
1 files changed, 1 insertions, 15 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 67e78e87ee..643dcf40cc 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -103,8 +103,6 @@ Ales Beaumont
Alexandrea Fride
STORM-255
STORM-960
- STORM-1327
- STORM-1406
Alissa Sabre
VWR-81
VWR-83
@@ -161,6 +159,7 @@ Ann Congrejo
Ansariel Hiller
STORM-1101
VWR-25480
+ VWR-26150
Ardy Lay
STORM-859
VWR-19499
@@ -446,20 +445,9 @@ Jonathan Yap
STORM-1236
STORM-1259
STORM-787
- VWR-25480
- STORM-1334
STORM-1313
STORM-899
STORM-1273
- STORM-457
- STORM-1452
- STORM-1406
- STORM-1327
- STORM-1396
- STORM-1292
- STORM-1392
- STORM-1302
- STORM-1326
Kage Pixel
VWR-11
Ken March
@@ -792,7 +780,6 @@ Strife Onizuka
SNOW-691
TankMaster Finesmith
STORM-1100
- STORM-1452
Tayra Dagostino
SNOW-517
SNOW-543
@@ -925,7 +912,6 @@ WolfPup Lowenhar
STORM-825
STORM-859
STORM-1098
- STORM-1393
VWR-20741
VWR-20933
Zai Lynch