diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-22 14:41:47 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-22 14:41:47 +0300 |
commit | 71d4ecf182642dbb9ec7c155d3b2606b8b1fb4a2 (patch) | |
tree | 863c77156e486dec16505ba6586208879ad27e5f /.gitignore | |
parent | 45a376dd2d505af343cfff68e4343c7650f2565c (diff) | |
parent | 1f02280904fcfbb2bd86404d1c85c025634f8c9d (diff) | |
download | mariadb-git-71d4ecf182642dbb9ec7c155d3b2606b8b1fb4a2.tar.gz |
Merge 10.6 into 10.7
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 3aeedcd0774..b1061575983 100644 --- a/.gitignore +++ b/.gitignore @@ -10,8 +10,11 @@ .ninja_* *.mri *.mri.tpl +/.cproject +/.project .gdb_history .vs/ +/.settings/ errmsg.sys typescript _CPack_Packages |