diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-09-25 16:15:16 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-09-25 16:15:16 -0400 |
| commit | 650c20f1ca4e07591a727e1cfcc74b3363d15985 (patch) | |
| tree | 85d11f6437cde22f410c25e0e5f71a3131ebd07d /nextstep/GNUstep | |
| parent | 8869332684c2302b5ba1ead4568bbc7ba1c0183e (diff) | |
| parent | 4b85ae6a24380fb67a3315eaec9233f17a872473 (diff) | |
| download | emacs-650c20f1ca4e07591a727e1cfcc74b3363d15985.tar.gz emacs-650c20f1ca4e07591a727e1cfcc74b3363d15985.tar.bz2 emacs-650c20f1ca4e07591a727e1cfcc74b3363d15985.zip | |
Merge 'master' into noverlay
Diffstat (limited to 'nextstep/GNUstep')
| -rw-r--r-- | nextstep/GNUstep/Emacs.base/Resources/README | 5 | ||||
| -rw-r--r-- | nextstep/GNUstep/Emacs.base/Resources/emacs.tiff | bin | 9464 -> 16751 bytes |
2 files changed, 3 insertions, 2 deletions
diff --git a/nextstep/GNUstep/Emacs.base/Resources/README b/nextstep/GNUstep/Emacs.base/Resources/README index 6b1e94bde6d..4f80e00ace0 100644 --- a/nextstep/GNUstep/Emacs.base/Resources/README +++ b/nextstep/GNUstep/Emacs.base/Resources/README @@ -1,5 +1,6 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES File: emacs.tiff - This is a version of the Emacs 23 icon (see etc/images/icons/README) - by Kentaro Ohkouchi <nanasess@fsm.ne.jp>. + Automatically converted from the Emacs 25 icon + etc/images/icons/hicolor/scalable/apps/emacs.svg + and subject to the same conditions. diff --git a/nextstep/GNUstep/Emacs.base/Resources/emacs.tiff b/nextstep/GNUstep/Emacs.base/Resources/emacs.tiff Binary files differindex 42e89cedc05..29381adbde7 100644 --- a/nextstep/GNUstep/Emacs.base/Resources/emacs.tiff +++ b/nextstep/GNUstep/Emacs.base/Resources/emacs.tiff |