From 9dfe0ca9a0228c4fa75c8a3e51840696cc6b4960 Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Fri, 22 May 2009 09:58:47 +0000 Subject: svn merge -r121194:121210 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1 QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk --- doc/contributions.txt | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 98c80288da..31ea1bbc5b 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -14,6 +14,8 @@ Adam Marker VWR-2755 Agathos Frascati CT-246 + CT-317 + CT-352 Aimee Trescothick VWR-1813 VWR-3321 @@ -109,6 +111,8 @@ Biancaluce Robbiani CT-229 CT-230 CT-231 + CT-321 + CT-352 Blakar Ogre VWR-418 VWR-881 @@ -129,6 +133,9 @@ Bulli Schumann CT-222 CT-223 CT-224 + CT-319 + CT-350 + CT-352 bushing Spatula VWR-119 VWR-424 @@ -179,6 +186,9 @@ Eddy Stryker EponymousDylan Ra VWR-1289 VWR-1465 +Eva Nowicka + CT-324 + CT-352 Farallon Greyskin VWR-2036 Feep Larsson @@ -248,7 +258,12 @@ Hoze Menges VWR-255 Ian Kas VWR-8780 (Russian localization) - [NO JIRA] (Ukranian localization) + [NO JIRA] (Ukranian localization) + CT-322 + CT-325 +Irene Muni + CT-324 + CT-352 Iskar Ariantho VWR-1223 VWR-11759 @@ -288,10 +303,15 @@ Lisa Lowe CT-222 CT-223 CT-224 + CT-319 Lockhart Cordoso VWR-108 maciek marksman CT-86 +Magnus Balczo + CT-138 +Malwina Dollinger + CT-138 march Korda SVC-1020 Matthew Dowd @@ -434,9 +454,12 @@ Pf Shan CT-229 CT-230 CT-231 + CT-321 princess niven VWR-5733 CT-85 + CT-320 + CT-352 Renault Clio VWR-1976 Ringo Tuxing @@ -447,6 +470,7 @@ Ringo Tuxing CT-229 CT-230 CT-231 + CT-321 Robin Cornelius VWR-2488 VWR-9557 @@ -462,6 +486,7 @@ Salahzar Stenvaag CT-229 CT-230 CT-231 + CT-321 Sammy Frederix VWR-6186 Scrippy Scofield @@ -482,6 +507,7 @@ Sergen Davies CT-229 CT-230 CT-231 + CT-321 SignpostMarv Martin VWR-153 VWR-154 @@ -540,6 +566,8 @@ Thraxis Epsilon VWR-383 tiamat bingyi CT-246 +TraductoresAnonimos Alter + CT-324 Tue Torok CT-68 CT-69 @@ -551,6 +579,7 @@ Vadim Bigbear VWR-2681 Vixen Heron VWR-2710 + CT-88 Whoops Babii VWR-631 VWR-1640 -- cgit v1.2.3 From 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Sun, 21 Jun 2009 08:04:56 +0000 Subject: merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 ignore-dead-branch --- doc/contributions.txt | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 31ea1bbc5b..a4647f005d 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -197,6 +197,7 @@ Feep Larsson VWR-4444 Flemming Congrejo CT-193 + CT-318 Fluf Fredriksson VWR-3450 Fremont Cunningham @@ -274,6 +275,9 @@ Jacek Antonelli VWR-597 VWR-2054 VWR-2448 + VWR-2896 + VWR-2947 + VWR-2948 VWR-3605 JB Kraft VWR-5283 @@ -350,6 +354,7 @@ Michelle2 Zenovka Mm Alder VWR-3777 VWR-4794 + VWR-13578 Mr Greggan VWR-445 Nicholaz Beresford -- cgit v1.2.3