diff options
| author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2020-09-19 07:55:16 +0300 |
|---|---|---|
| committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2020-09-19 07:55:16 +0300 |
| commit | 5e40fa752b462b2ce313fd63508a38e7120aa688 (patch) | |
| tree | e4f767b2b85e3223fc4406016b06d056ae1c2351 /.gitignore | |
| parent | c936711f31038bd8c607047b5aa882ff40e7e7ae (diff) | |
| parent | fa5632e99e1ff723026fca053e4edc5aa8acbb3d (diff) | |
Merge branch 'dev' into release
# Conflicts:
# CMakeLists.txt
# res/about/help.gmi
# res/about/version.gmi
# src/app.c
# src/ui/documentwidget.c
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -4,5 +4,5 @@ | |||
| 4 | build-* | 4 | build-* |
| 5 | /.vsbuild | 5 | /.vsbuild |
| 6 | /.vscode | 6 | /.vscode |
| 7 | /lib | 7 | |
| 8 | 8 | ||