diff options
| author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-05-18 07:04:27 +0300 |
|---|---|---|
| committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-05-18 07:04:27 +0300 |
| commit | facc3abb7faafb323cb87e26ddba8dac01af02e9 (patch) | |
| tree | 387aa23e03b029f516ecca6880131fd6523e1c3f /src/media.c | |
| parent | ced855c338b78e05c66d38618373728ef946ebaa (diff) | |
| parent | 5d517c2f790a38d7fe3c3cc59a1b39fd49e20280 (diff) | |
Merge branch 'dev' into work/typesetter
# Conflicts:
# src/ui/documentwidget.c
# src/ui/inputwidget.c
Diffstat (limited to 'src/media.c')
0 files changed, 0 insertions, 0 deletions