diff options
| author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-06-09 19:01:15 +0300 |
|---|---|---|
| committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-06-09 19:01:15 +0300 |
| commit | f63ed76597b462c60b3a6ad89f8c165ffb87d00c (patch) | |
| tree | 2aca3537930bce28acff14c0cee0a11fa1988661 /src/ui/mediaui.h | |
| parent | 5f9685010addd4a0f04c13f889856084381dd1c6 (diff) | |
| parent | ee17ef3d0135027fbc4ff816dd9e793b4bb0b883 (diff) | |
Merge branch 'dev' into work/typesetter
# Conflicts:
# src/gmdocument.c
# src/ui/documentwidget.c
# src/ui/inputwidget.h
Diffstat (limited to 'src/ui/mediaui.h')
0 files changed, 0 insertions, 0 deletions