diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 11:38:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 11:38:21 +0300 |
| commit | 4a7dfda373ff9e28e4f4f35bad76cbfc20934a9a (patch) | |
| tree | c8b327da16aa30bc5a26bfa31a2563af1c6f4976 /.gitignore | |
| parent | ff77a09bda884fe6bf3917eb29b9d3a2f53f919b (diff) | |
| parent | 2bb8d7c2f36439ab6a3944476665eb1218c36f5c (diff) | |
| download | mariadb-git-4a7dfda373ff9e28e4f4f35bad76cbfc20934a9a.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index c26767717c6..9af0e967db7 100644 --- a/.gitignore +++ b/.gitignore @@ -340,6 +340,7 @@ x86/ build/ bld/ [Bb]in/ +/cmake-build-debug/ [Oo]bj/ # Roslyn cache directories @@ -521,4 +522,5 @@ compile_commands.json # Visual Studio Code workspace .vscode/ +/.idea/ .cache/clangd |