diff options
author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-06-12 18:55:27 +0300 |
---|---|---|
committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-06-12 18:55:27 +0300 |
commit | aa59ecec89d89a29f7272352471a4064aa6db28c (patch) | |
tree | a8b2b53ce4913adc27291105fbbe5389333607eb /.gitignore | |
parent | 7bbe324fc17d9734833f717921629c36d1d0c996 (diff) | |
parent | 170bec36c0da1fb0269a063094a546022ed0888f (diff) | |
download | mariadb-git-aa59ecec89d89a29f7272352471a4064aa6db28c.tar.gz |
Merge branch '10.0' into 10.1
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index c3c140bb99a..abf45734d96 100644 --- a/.gitignore +++ b/.gitignore @@ -477,3 +477,9 @@ UpgradeLog*.htm # Microsoft Fakes FakesAssemblies/ + +# macOS garbage +.DS_Store + +# QtCreator && CodeBlocks +*.cbp |