Skip to content

Commit

Permalink
Merge branch 'fabiangreffrath:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
jopadan authored Nov 23, 2024
2 parents 3381f06 + dd46dfb commit ad7a522
Show file tree
Hide file tree
Showing 49 changed files with 1,727 additions and 372 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,8 @@ Files: `cmake/FindSDL2.cmake, cmake/FindSDL2_net.cmake`
Copyright: © 2018 Alex Mayfield.
License: [BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)

Files: `data/woof.ico, data/woof.png, src/icon.c, data/setup.ico, data/woof-setup.png, setup/setup_icon.c`
Copyright: © 2020-2022 Julia Nechaevskaya.
Files: `data/woof.ico, data/woof.png, src/icon.c, data/setup.ico, data/woof-setup.png, setup/setup_icon.c, base/all-all/sm*.png`
Copyright: © 2020-2024 Julia Nechaevskaya.
License: [CC-BY-3.0](https://creativecommons.org/licenses/by/3.0/)

Files: `opl/*`
Expand Down
22 changes: 22 additions & 0 deletions base/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,28 @@ set(BASE_SOURCES
all-all/sbardef.lmp
all-all/sbhuddef.lmp
all-all/skytran.lmp

all-all/smbfgg0.png
all-all/smbfgg1.png
all-all/smcsaw0.png
all-all/smcsaw1.png
all-all/smfist0.png
all-all/smfist1.png
all-all/smlaun0.png
all-all/smlaun1.png
all-all/smmgun0.png
all-all/smmgun1.png
all-all/smpisg0.png
all-all/smpisg1.png
all-all/smplas0.png
all-all/smplas1.png
all-all/smsgn20.png
all-all/smsgn21.png
all-all/smshot0.png
all-all/smshot1.png
all-all/smunkn0.png
all-all/smunkn1.png

all-all/stbr123.png
all-all/stbr124.png
all-all/stbr125.png
Expand Down
Loading

0 comments on commit ad7a522

Please sign in to comment.