summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-10-06 14:00:26 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-10-06 14:00:26 -0400
commit0a4b187301e1d5521dda7d2f157a94f02d597365 (patch)
tree92cee20619bc5406670689bfa06bf9dc45c23bc4 /doc
parenta7076142429eb604e4f756223b70ff85a5ea3490 (diff)
parent6095127468f91770abe276b7d55754bbec228df3 (diff)
merged .hgtags
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt17
-rw-r--r--doc/translations.txt7
2 files changed, 18 insertions, 6 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 55a3aaf1f4..bcdc5a63d2 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
@@ -176,6 +177,8 @@ Ardy Lay
VWR-24917
Argent Stonecutter
VWR-68
+ArminWeatherHax
+ STORM-1532
Armin Weatherwax
VWR-8436
ArminasX Saiman
@@ -476,6 +479,7 @@ Identity Euler
Ima Mechanique
OPEN-50
OPEN-61
+ OPEN-76
STORM-1175
Imnotgoing Sideways
Inma Rau
@@ -566,6 +570,11 @@ Jonathan Yap
STORM-1276
STORM-1462
STORM-1459
+ STORM-1297
+ STORM-1522
+ STORM-1567
+ STORM-1572
+ STORM-1574
Kadah Coba
STORM-1060
Jondan Lundquist
diff --git a/doc/translations.txt b/doc/translations.txt
index c9cfc1cdeb..9b7f2d6292 100644
--- a/doc/translations.txt
+++ b/doc/translations.txt
@@ -1,7 +1,9 @@
-#List of translators who contribute to SL Viewer 2.0+ and SL web translation by language
+#List of translators who contribute to SL Viewer 2.0+ by language
Danish
Flemming Congrejo
+ German
+Torben Trautman
French
Valerie Linden
Polish
@@ -21,6 +23,7 @@ Lunita Savira
Minerva Memel
Polo Gufler
Xiki Luik
-Perez Linden
+Shinya Tandino
+Catwise Yoshikawa
Traditional Chinese
gefeit Dufaux