diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-09-07 16:40:40 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-09-07 16:40:40 -0400 |
| commit | b8fddce34d1737acf32d83dac423dbb7a948cc4a (patch) | |
| tree | adf4c05ab3a42b2d3fed8fbda23c2de97840bab7 /doc | |
| parent | f73b795bb709b3060e06b4238ae4dac702f21301 (diff) | |
| parent | 82b1b1bc6ee91e1778a16634fb9e2988da23fd71 (diff) | |
Merge. Fixed issue with LLProxy code related to changes to the LLSocket interface.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/contributions.txt | 9 | ||||
| -rw-r--r-- | doc/translations.txt | 7 |
2 files changed, 10 insertions, 6 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 016aa0064a..5930bab04f 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 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 |