diff options
| author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2022-02-06 15:07:17 +0200 |
|---|---|---|
| committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2022-02-06 15:07:17 +0200 |
| commit | 076e34aa8d1e57cbf3142abdc91c8e88d21b75d6 (patch) | |
| tree | 3ee91315ee1a083b74d84637af28252f039fa084 /sdl2.0.18-macos-ios.diff | |
| parent | edb260848a42de2e1af44cab93dbf267d20e1f6f (diff) | |
| parent | 53ab74c3a25521faa6f41b40b1969a3b8e8ad027 (diff) | |
Merge branch 'dev' into work/v1.11
# Conflicts:
# CMakeLists.txt
# res/fonts/SmolEmoji-Regular.ttf
# res/lang/gl.bin
# src/app.c
Diffstat (limited to 'sdl2.0.18-macos-ios.diff')
0 files changed, 0 insertions, 0 deletions