commit 9b38d6dfbc8ef673a611f97a41d5918616211efd
Merge: f917a14a a5dad4f7
Author: Simon Howard <fraggle@soulsphere.org>
AuthorDate: Mon Jun 20 09:15:00 2022 -0400
Commit: GitHub <noreply@github.com>
CommitDate: Mon Jun 20 09:15:00 2022 -0400
Merge pull request #1472 from chocolate-doom/new-icon
Change to new icon.
data/Makefile.am | 3 +-
data/doom.png | Bin 23029 -> 4551 bytes
data/doom8.ico | Bin 2238 -> 0 bytes
data/setup.png | Bin 24247 -> 5654 bytes
data/setup8.ico | Bin 2238 -> 0 bytes
data/wadfile.png | Bin 0 -> 8681 bytes
pkg/Makefile.am | 4 -
pkg/osx/.gitignore | 4 +
pkg/osx/GNUmakefile | 15 +-
pkg/osx/Resources/128x128.png | Bin 23029 -> 0 bytes
pkg/osx/Resources/app.icns | Bin 51625 -> 0 bytes
pkg/osx/Resources/wadfile.icns | Bin 44092 -> 0 bytes
pkg/osx/Resources/wadfile.png | Bin 2249 -> 0 bytes
src/icon.c | 4686 +++++++++++++++++++-------------------
src/setup/setup_icon.c | 4844 ++++++++++++++++++++--------------------
15 files changed, 4784 insertions(+), 4772 deletions(-)