diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-06-10 17:16:27 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-06-10 17:16:27 +0300 |
| commit | 3ead95118098340f7fe36e34e1690839d183db1e (patch) | |
| tree | 90dcbcf7f6793609af78220fd45bf7337f00ff62 /.gitignore | |
| parent | 7053e26e1869962ef473043686996f40ac0fb88c (diff) | |
| parent | 1d43f71c7b4c39a6fd196c104b5ebafb65376199 (diff) | |
| download | mariadb-git-3ead95118098340f7fe36e34e1690839d183db1e.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index f1c300a89c6..b8d5ea0f803 100644 --- a/.gitignore +++ b/.gitignore @@ -461,3 +461,9 @@ UpgradeLog*.htm # Microsoft Fakes FakesAssemblies/ + +# macOS garbage +.DS_Store + +# QtCreator && CodeBlocks +*.cbp |