diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 12:03:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 12:03:32 +0300 |
| commit | a736a3174a4e7c0d92a38901ae61f563d4afede7 (patch) | |
| tree | 348d15f7c9cc883e86d852fbddc780f506669ee4 /.gitignore | |
| parent | b44e12fef176bfc0884fb2c5f4ba7f42bf054f44 (diff) | |
| parent | 4a7dfda373ff9e28e4f4f35bad76cbfc20934a9a (diff) | |
| download | mariadb-git-a736a3174a4e7c0d92a38901ae61f563d4afede7.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index b3cbd1d430d..99c47b46966 100644 --- a/.gitignore +++ b/.gitignore @@ -373,6 +373,7 @@ x86/ build/ bld/ [Bb]in/ +/cmake-build-debug/ [Oo]bj/ # Roslyn cache directories @@ -555,7 +556,7 @@ compile_commands.json .vscode/ # Clion && other JetBrains ides -.idea +/.idea/ .cache/clangd |