diff options
| author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-06-25 16:22:29 +0300 |
|---|---|---|
| committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-06-25 16:22:29 +0300 |
| commit | f99a9111170f2ff28383fd3172fdaf4b9a1ba069 (patch) | |
| tree | a4c5b801298a569c5043ba69a1b9a6c010a9234c /src/bookmarks.c | |
| parent | e84b1a4a13ee1932c609e9d9d64b0915fbf468b9 (diff) | |
| parent | d06c19e7fdd07ffc52ca4d4903fecf5b539f85ea (diff) | |
Merge branch 'dev' into work/v1.6
# Conflicts:
# CMakeLists.txt
Diffstat (limited to 'src/bookmarks.c')
0 files changed, 0 insertions, 0 deletions