diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2026-01-20 03:56:38 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2026-01-20 03:56:38 +0200 |
| commit | 30e7621140a3cbf4c911f596c1325f4b7eae25a6 (patch) | |
| tree | c91ced079bd5b84eb5cd3c7a9c3b3b7bb8367057 /doc | |
| parent | 7d616292ad664472ffa79cc0cd447096a18e72ba (diff) | |
| parent | 8bacd29bcb36b87ca237fe3ff9459461c1a4cf55 (diff) | |
Merge branch 'develop-linux' into project/lua_editor
# Conflicts:
# indra/newview/llpreviewscript.cpp
Diffstat (limited to 'doc')
| -rw-r--r--[-rwxr-xr-x] | doc/LGPL-license.txt | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | doc/LICENSE-logos.txt | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | doc/LICENSE-source.txt | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | doc/contributions.txt | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | doc/releasenotes-where.txt | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | doc/translations.txt | 0 |
6 files changed, 0 insertions, 0 deletions
diff --git a/doc/LGPL-license.txt b/doc/LGPL-license.txt index 4362b49151..4362b49151 100755..100644 --- a/doc/LGPL-license.txt +++ b/doc/LGPL-license.txt diff --git a/doc/LICENSE-logos.txt b/doc/LICENSE-logos.txt index 66f8745f4f..66f8745f4f 100755..100644 --- a/doc/LICENSE-logos.txt +++ b/doc/LICENSE-logos.txt diff --git a/doc/LICENSE-source.txt b/doc/LICENSE-source.txt index 3de5123415..3de5123415 100755..100644 --- a/doc/LICENSE-source.txt +++ b/doc/LICENSE-source.txt diff --git a/doc/contributions.txt b/doc/contributions.txt index 1f911a8b39..1f911a8b39 100755..100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt diff --git a/doc/releasenotes-where.txt b/doc/releasenotes-where.txt index 4af5866905..4af5866905 100755..100644 --- a/doc/releasenotes-where.txt +++ b/doc/releasenotes-where.txt diff --git a/doc/translations.txt b/doc/translations.txt index 9b7f2d6292..9b7f2d6292 100755..100644 --- a/doc/translations.txt +++ b/doc/translations.txt |