diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-05-21 16:18:48 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-05-21 16:18:48 -0400 |
| commit | a04a706c1bf145505afd2da8d149ba909b56045f (patch) | |
| tree | 574c526e1cf87bd840157151649d82eb689f2c5b /doc | |
| parent | 0f6a4a3389cdce6d5bb92cd6f4861a46def284cc (diff) | |
| parent | 0ebcb7e3fd1452d42b5ca48139f99a4fd632d235 (diff) | |
merge
Diffstat (limited to 'doc')
| -rwxr-xr-x[-rw-r--r--] | doc/LGPL-licence.txt | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | doc/LICENSE-logos.txt | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | doc/LICENSE-source.txt | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | doc/contributions.txt | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | doc/releasenotes-where.txt | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | doc/translations.txt | 0 |
6 files changed, 5 insertions, 0 deletions
diff --git a/doc/LGPL-licence.txt b/doc/LGPL-licence.txt index 4362b49151..4362b49151 100644..100755 --- a/doc/LGPL-licence.txt +++ b/doc/LGPL-licence.txt diff --git a/doc/LICENSE-logos.txt b/doc/LICENSE-logos.txt index e63c48e542..e63c48e542 100644..100755 --- a/doc/LICENSE-logos.txt +++ b/doc/LICENSE-logos.txt diff --git a/doc/LICENSE-source.txt b/doc/LICENSE-source.txt index 407402265e..407402265e 100644..100755 --- a/doc/LICENSE-source.txt +++ b/doc/LICENSE-source.txt diff --git a/doc/contributions.txt b/doc/contributions.txt index d7f050a916..09c0d01b11 100644..100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1069,10 +1069,12 @@ Sheet Spotter Shnurui Troughton Shyotl Kuhr MAINT-1138 + MAINT-2334 Siana Gearz STORM-960 STORM-1088 MAINT-1138 + MAINT-2334 sicarius Thorne Sicarius Toxx SignpostMarv Martin @@ -1090,6 +1092,8 @@ SLB Wirefly Slee Mayo SEC-1075 snowy Sidran +Sovereign Engineer + MAINT-2334 SpacedOut Frye VWR-34 VWR-45 @@ -1343,3 +1347,4 @@ Zoex Flanagan + diff --git a/doc/releasenotes-where.txt b/doc/releasenotes-where.txt index 4af5866905..4af5866905 100644..100755 --- a/doc/releasenotes-where.txt +++ b/doc/releasenotes-where.txt diff --git a/doc/translations.txt b/doc/translations.txt index 9b7f2d6292..9b7f2d6292 100644..100755 --- a/doc/translations.txt +++ b/doc/translations.txt |