diff options
| author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-11-04 15:34:36 +0200 |
|---|---|---|
| committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-11-04 15:34:36 +0200 |
| commit | b8b94803b540ec7c43192a42ea9860a6df13c6c4 (patch) | |
| tree | 9ceddae2869cb80b91eccb3cd8c5614aae25e864 /sdl2-macos-ios.diff | |
| parent | 94b0c2e7954bd5222f1909b07301da351d99d6f4 (diff) | |
| parent | 882cef9d0d3818bd7d0d4abfb1100ce77ab24886 (diff) | |
Merge branch 'dev' into work/v1.9
# Conflicts:
# src/lang.c
Diffstat (limited to 'sdl2-macos-ios.diff')
0 files changed, 0 insertions, 0 deletions