diff options
| author | simon <none@none> | 2013-05-09 13:21:22 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-05-09 13:21:22 -0700 |
| commit | 8895e795763d14c3dae495b3648da3d4a52ba30a (patch) | |
| tree | efdb765ff9c99ab179bf252aa0cee87e6ac410e7 /doc | |
| parent | 35f7a750836b72cb116e60b315ca32664911001b (diff) | |
| parent | c7f7c4bc4d9155f5e9cd83265e189f689739da62 (diff) | |
Merge downstream code / viewer-beta
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 cb3b03f2d9..0b55275f53 100644..100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1071,10 +1071,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 @@ -1092,6 +1094,8 @@ SLB Wirefly Slee Mayo SEC-1075 snowy Sidran +Sovereign Engineer + MAINT-2334 SpacedOut Frye VWR-34 VWR-45 @@ -1345,3 +1349,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 |