diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2026-05-21 19:37:15 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2026-05-21 19:37:15 +0300 |
| commit | 15d82beb6056fa16a1ea1cbf01c5d673a95e0267 (patch) | |
| tree | 55af7639161926313434d9e4a8b9872369668d5d /autobuild.xml | |
| parent | ff536adef0b74c20f55bd501ad593e4eef762082 (diff) | |
| parent | 6d4c4c029ce43aa413266135829cd2bc00001890 (diff) | |
Merge branch 'main' into marchcat/slua-26.2
# Conflicts:
# indra/llfilesystem/lldir.cpp
# indra/llfilesystem/llfilesystem.cpp
# indra/newview/llappviewer.cpp
# indra/newview/lltexturecache.cpp
# indra/newview/llvoiceclient.cpp
# indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
Diffstat (limited to 'autobuild.xml')
| -rw-r--r-- | autobuild.xml | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/autobuild.xml b/autobuild.xml index 3f07900e58..ade79ef9ad 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2329,6 +2329,38 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>description</key> <string>Viewer fonts</string> </map> + <key>google-fonts</key> + <map> + <key>platforms</key> + <map> + <key>common</key> + <map> + <key>archive</key> + <map> + <key>hash</key> + <string>8de96fd083783b9f4df1d8d7028c8a713a7d7217</string> + <key>hash_algorithm</key> + <string>sha1</string> + <key>url</key> + <string>https://github.com/secondlife/3p-google-fonts/releases/download/v1.0.0-r6/google_fonts-1.0.0.24469773244-common-24469773244.tar.zst</string> + </map> + <key>name</key> + <string>common</string> + </map> + </map> + <key>license</key> + <string>SIL Open Font License, Version 1.1</string> + <key>license_file</key> + <string>LICENSES/google_inter.txt</string> + <key>copyright</key> + <string>Copyright 2020 The Inter Project Authors (https://github.com/rsms/inter)</string> + <key>version</key> + <string>1.0.0.22606339007</string> + <key>name</key> + <string>google-fonts</string> + <key>description</key> + <string>Google fonts</string> + </map> <key>viewer-manager</key> <map> <key>platforms</key> |