summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-10-18 16:36:24 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-10-18 16:36:24 +0300
commit9c5835e067e99e1f85477f28d3bdc807537393a8 (patch)
tree644c828a4812ab1f0fffb3ada2deb5822997ce46 /.gitignore
parent78e023c2743c9b7fc17db31cc11524920b658075 (diff)
parent18eab4a83280049974265358b0d78389d05cd67b (diff)
downloadmariadb-git-9c5835e067e99e1f85477f28d3bdc807537393a8.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
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