diff options
| author | Ricky Curtice <kf6kjg+hg@gmail.com> | 2011-04-29 14:23:27 -0700 |
|---|---|---|
| committer | Ricky Curtice <kf6kjg+hg@gmail.com> | 2011-04-29 14:23:27 -0700 |
| commit | 89216a6c213c126b8ab6dacaeb21340fa8f7a001 (patch) | |
| tree | 42d83ed5f5d34edf99c4b302d9d6744a33e5098f /doc | |
| parent | 26f2762b89705a69e831016ea67af9500907721d (diff) | |
| parent | 363e296dde5fbd56f9bf4382285b162712d582e2 (diff) | |
Merged with viewer-development.
The reason was to manually resolve a couple of merge problems, as upstream has had several changes since this was applied, and some of the changes overlapped.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/contributions.txt | 40 |
1 files changed, 36 insertions, 4 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index ae10957b24..957d02d153 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1,8 +1,7 @@ Linden Lab would like to acknowledge source code contributions from the following residents. The Second Life resident name is given below, along with the issue identifier corresponding to the patches we've -received from them. To see more about these contributions, visit the -browsable version: http://wiki.secondlife.com/wiki/Source_contributions +received from them. Able Whitman VWR-650 @@ -84,10 +83,12 @@ Aleric Inglewood VWR-24315 VWR-24317 VWR-24320 - VWR-24321 + VWR-24321 + VWR-24337 VWR-24354 VWR-24366 VWR-24519 + VWR-24520 SNOW-84 SNOW-477 SNOW-744 @@ -154,6 +155,8 @@ Angus Boyd VWR-592 Ann Congrejo CT-193 +Ansariel Hiller + STORM-1101 Ardy Lay VWR-19499 VWR-24917 @@ -192,6 +195,7 @@ blino Nakamura VWR-17 Boroondas Gupte OPEN-29 + OPEN-39 SNOW-278 SNOW-503 SNOW-510 @@ -204,6 +208,7 @@ Boroondas Gupte VWR-20583 VWR-20891 VWR-23455 + VWR-24487 WEB-262 Bulli Schumann CT-218 @@ -237,6 +242,7 @@ Coaldust Numbers VWR-1095 Cron Stardust VWR-10579 + VWR-25120 STORM-1075 Cypren Christenson STORM-417 @@ -407,7 +413,19 @@ Jonathan Yap STORM-1040 VWR-17801 VWR-24347 - STORM-990 + STORM-975 + STORM-1019 + STORM-844 + STORM-643 + STORM-1020 + STORM-1064 + STORM-960 + STORM-1101 + STORM-1108 + STORM-1094 + STORM-1077 + STORM-953 + STORM-1095 Kage Pixel VWR-11 Ken March @@ -424,10 +442,13 @@ Kitty Barnett STORM-288 STORM-799 STORM-800 + STORM-1001 VWR-24217 Kunnis Basiat VWR-82 VWR-102 +Lance Corrimal + VWR-25269 Latif Khalifa VWR-5370 Lisa Lowe @@ -567,6 +588,10 @@ Nicholaz Beresford VWR-2412 VWR-2682 VWR-2684 +Nicky Perian + OPEN-1 + STORM-1087 + STORM-1090 Nounouch Hapmouche VWR-238 Patric Mills @@ -636,6 +661,8 @@ Robin Cornelius SNOW-747 STORM-422 STORM-960 + STORM-1019 + STORM-1095 VWR-2488 VWR-9557 VWR-10579 @@ -686,6 +713,7 @@ Shawn Kaufmat SNOW-240 Siana Gearz STORM-960 + STORM-1088 SignpostMarv Martin VWR-153 VWR-154 @@ -772,6 +800,7 @@ Thickbrick Sleaford VWR-13483 VWR-13947 VWR-24420 + STORM-1147 Thraxis Epsilon SVC-371 VWR-383 @@ -830,6 +859,8 @@ Whoops Babii Wilton Lundquist VWR-7682 WolfPup Lowenhar + OPEN-1 + OPEN-37 SNOW-622 SNOW-772 STORM-102 @@ -845,6 +876,7 @@ WolfPup Lowenhar STORM-674 STORM-776 STORM-825 + STORM-1098 VWR-20741 VWR-20933 Zai Lynch |