diff options
| author | unknown | 2008-12-19 00:17:06 -0700 |
|---|---|---|
| committer | unknown | 2008-12-19 00:17:06 -0700 |
| commit | e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554 (patch) | |
| tree | f4ae195b239b9ae3ed8ca53c2dc6f20a24ff7dc7 /linden/doc | |
| parent | fuckyougit (diff) | |
| parent | 1.1 wip copy (diff) | |
| download | meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.zip meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.gz meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.bz2 meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.xz | |
resolved merge conflicts
Diffstat (limited to 'linden/doc')
| -rw-r--r-- | linden/doc/contributions.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt index 55156f0..ac24d99 100644 --- a/linden/doc/contributions.txt +++ b/linden/doc/contributions.txt | |||
| @@ -13,6 +13,7 @@ Adam Marker | |||
| 13 | VWR-2755 | 13 | VWR-2755 |
| 14 | Aimee Trescothick | 14 | Aimee Trescothick |
| 15 | VWR-3903 | 15 | VWR-3903 |
| 16 | VWR-3336 | ||
| 16 | VWR-4083 | 17 | VWR-4083 |
| 17 | VWR-8341 | 18 | VWR-8341 |
| 18 | VWR-8430 | 19 | VWR-8430 |