diff options
| author | Aleric Inglewood | 2010-10-15 17:49:06 +0200 |
|---|---|---|
| committer | Aleric Inglewood | 2010-10-15 17:49:06 +0200 |
| commit | 67f55bad571044535f1d8c3b3c3afb5078249fd3 (patch) | |
| tree | d5e9f43ed6b44837faed947a09b13648d55087ba /linden/doc | |
| parent | Revert "port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewe... (diff) | |
| download | meta-impy-67f55bad571044535f1d8c3b3c3afb5078249fd3.zip meta-impy-67f55bad571044535f1d8c3b3c3afb5078249fd3.tar.gz meta-impy-67f55bad571044535f1d8c3b3c3afb5078249fd3.tar.bz2 meta-impy-67f55bad571044535f1d8c3b3c3afb5078249fd3.tar.xz | |
RED-595: Manual merge with weekly-webkit.
Plus some white space fixes (TABs --> spaces) in install.xml.
Diffstat (limited to 'linden/doc')
| -rw-r--r-- | linden/doc/contributions.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt index 931794c..4d3f017 100644 --- a/linden/doc/contributions.txt +++ b/linden/doc/contributions.txt | |||
| @@ -80,6 +80,7 @@ Aleric Inglewood | |||
| 80 | RED-578 | 80 | RED-578 |
| 81 | RED-579 | 81 | RED-579 |
| 82 | RED-581 | 82 | RED-581 |
| 83 | RED-595 | ||
| 83 | Alissa Sabre | 84 | Alissa Sabre |
| 84 | VWR-81 | 85 | VWR-81 |
| 85 | VWR-83 | 86 | VWR-83 |
| @@ -512,6 +513,7 @@ Robin Cornelius | |||
| 512 | VWR-2488 | 513 | VWR-2488 |
| 513 | VWR-9557 | 514 | VWR-9557 |
| 514 | VWR-12838 | 515 | VWR-12838 |
| 516 | RED-595 | ||
| 515 | Ryozu Kojima | 517 | Ryozu Kojima |
| 516 | VWR-53 | 518 | VWR-53 |
| 517 | VWR-287 | 519 | VWR-287 |