diff options
| author | Philip Kaludercic | 2026-02-01 21:01:40 +0100 |
|---|---|---|
| committer | Philip Kaludercic | 2026-02-01 21:01:40 +0100 |
| commit | 2cde30aa1b060ceeb202e793a979357ecb559374 (patch) | |
| tree | e97c621c4791e881cf355604bbedd11b0ca2da6b /admin | |
| parent | 850382c7d6ec386cb5f42ea125b0458953322504 (diff) | |
| parent | 8f5badc26bc47b0964f299cdb81354aff3e952b2 (diff) | |
| download | emacs-2cde30aa1b060ceeb202e793a979357ecb559374.tar.gz emacs-2cde30aa1b060ceeb202e793a979357ecb559374.zip | |
Merge remote-tracking branch 'origin/master' into feature/package-autosuggest
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/authors.el | 1 | ||||
| -rw-r--r-- | admin/download-android-deps.sh | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/admin/authors.el b/admin/authors.el index afcc56c6003..41653b8bddf 100644 --- a/admin/authors.el +++ b/admin/authors.el | |||
| @@ -69,6 +69,7 @@ files.") | |||
| 69 | (nil "BlaCk_Void" "alstjr7375@daum\\.net") | 69 | (nil "BlaCk_Void" "alstjr7375@daum\\.net") |
| 70 | (nil "bug-gnu-emacs@gnu\\.org") ; mistake | 70 | (nil "bug-gnu-emacs@gnu\\.org") ; mistake |
| 71 | ("Björn Torkelsson" "Bjorn Torkelsson") | 71 | ("Björn Torkelsson" "Bjorn Torkelsson") |
| 72 | ("Boris Buliga" "boris@d12frosted\\.io") | ||
| 72 | (nil "brandon\\.irizarry@gmail\\.com") | 73 | (nil "brandon\\.irizarry@gmail\\.com") |
| 73 | ("Brian Fox" "Brian J\\. Fox") | 74 | ("Brian Fox" "Brian J\\. Fox") |
| 74 | ("Brian P Templeton" "BT Templeton") | 75 | ("Brian P Templeton" "BT Templeton") |
diff --git a/admin/download-android-deps.sh b/admin/download-android-deps.sh index e40392381d7..f2578e284d9 100644 --- a/admin/download-android-deps.sh +++ b/admin/download-android-deps.sh | |||
| @@ -61,7 +61,7 @@ download_tarball () | |||
| 61 | # 1c8f3b0cbad474da0ab09018c4ecf2119ac4a52d pixman-0.38.4-emacs.tar.gz | 61 | # 1c8f3b0cbad474da0ab09018c4ecf2119ac4a52d pixman-0.38.4-emacs.tar.gz |
| 62 | # b687c8439d51634d921674dd009645e24873ca36 rsvg-2.40.21-emacs.tar.gz | 62 | # b687c8439d51634d921674dd009645e24873ca36 rsvg-2.40.21-emacs.tar.gz |
| 63 | # eda251614598aacb06f5984a0a280833de456b29 tiff-4.5.1-emacs.tar.gz | 63 | # eda251614598aacb06f5984a0a280833de456b29 tiff-4.5.1-emacs.tar.gz |
| 64 | # c00d0ea9c6e848f5cce350cb3ed742024f2bdb8b tree-sitter-0.20.7-emacs.tar.gz | 64 | # 9d032de89c874354c22d304f7e968f4ca6de8c0a tree-sitter-0.26.3-emacs.tar.gz |
| 65 | 65 | ||
| 66 | download_tarball "giflib-5.2.1-emacs.tar.gz" "giflib-5.2.1" \ | 66 | download_tarball "giflib-5.2.1-emacs.tar.gz" "giflib-5.2.1" \ |
| 67 | "a407c568961d729bb2d0175a34e0d4ed4a269978" | 67 | "a407c568961d729bb2d0175a34e0d4ed4a269978" |
| @@ -90,8 +90,8 @@ download_tarball "libtasn1-4.19.0-emacs.tar.gz" "libtasn1-4.19.0" \ | |||
| 90 | "fdc827211075d9b70a8ba6ceffa02eb48d6741e9" | 90 | "fdc827211075d9b70a8ba6ceffa02eb48d6741e9" |
| 91 | download_tarball "libselinux-3.6-emacs.tar.gz" "libselinux-3.6" \ | 91 | download_tarball "libselinux-3.6-emacs.tar.gz" "libselinux-3.6" \ |
| 92 | "8361966e19fe25ae987b08799f1442393ae6366b" | 92 | "8361966e19fe25ae987b08799f1442393ae6366b" |
| 93 | download_tarball "tree-sitter-0.20.7-emacs.tar.gz" "tree-sitter-0.20.7" \ | 93 | download_tarball "tree-sitter-0.26.3-emacs.tar.gz" "tree-sitter-0.26.3" \ |
| 94 | "c00d0ea9c6e848f5cce350cb3ed742024f2bdb8b" | 94 | "9d032de89c874354c22d304f7e968f4ca6de8c0a" |
| 95 | download_tarball "harfbuzz-7.1.0-emacs.tar.gz" "harfbuzz-7.1.0" \ | 95 | download_tarball "harfbuzz-7.1.0-emacs.tar.gz" "harfbuzz-7.1.0" \ |
| 96 | "22dc71d503ab2eb263dc8411de9da1db144520f5" | 96 | "22dc71d503ab2eb263dc8411de9da1db144520f5" |
| 97 | download_tarball "tiff-4.5.1-emacs.tar.gz" "tiff-4.5.1" \ | 97 | download_tarball "tiff-4.5.1-emacs.tar.gz" "tiff-4.5.1" \ |