diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-18 16:36:24 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-18 16:36:24 +0300 |
commit | 9c5835e067e99e1f85477f28d3bdc807537393a8 (patch) | |
tree | 644c828a4812ab1f0fffb3ada2deb5822997ce46 /.gitignore | |
parent | 78e023c2743c9b7fc17db31cc11524920b658075 (diff) | |
parent | 18eab4a83280049974265358b0d78389d05cd67b (diff) | |
download | mariadb-git-9c5835e067e99e1f85477f28d3bdc807537393a8.tar.gz |
Merge 10.5 into 10.6
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 00157d50d69..485b2d186cf 100644 --- a/.gitignore +++ b/.gitignore @@ -10,8 +10,11 @@ .ninja_* *.mri *.mri.tpl +/.cproject +/.project .gdb_history .vs/ +/.settings/ errmsg.sys typescript _CPack_Packages |