diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 16:37:12 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 16:37:12 +0300 |
| commit | b4911f5a34f8dcfb642c6f14535bc9d5d97ade44 (patch) | |
| tree | aa2dd694fa9d8fc42aaa0a6c5efb7bd1ec5ddd90 /.gitignore | |
| parent | 8c5e5e1be9353b90f341aad73cb3d2ed7c405a96 (diff) | |
| parent | 607de9c7ac53c3fbf0e92ca7a2c505014cd4e4de (diff) | |
| download | mariadb-git-b4911f5a34f8dcfb642c6f14535bc9d5d97ade44.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index e2a227492d3..3aeedcd0774 100644 --- a/.gitignore +++ b/.gitignore @@ -359,6 +359,7 @@ x86/ build/ bld/ [Bb]in/ +/cmake-build-debug/ [Oo]bj/ # Roslyn cache directories @@ -542,7 +543,7 @@ compile_commands.json .vscode/ # Clion && other JetBrains ides -.idea +/.idea/ .cache/clangd |