diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-06-21 23:47:39 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-06-21 23:47:39 +0200 |
| commit | b942aa34c10ddfa3fe4977ae60afed5cbdc51083 (patch) | |
| tree | 0a1a934ca7b728e3ffb81cd2f7c6a858524726d4 /.gitignore | |
| parent | fe3f9fa9183ea3d10397b6f7f4d422ae9bba00a4 (diff) | |
| parent | c09a8b5b36edb494e2bcc93074c06e26cd9f2b92 (diff) | |
| download | mariadb-git-b942aa34c10ddfa3fe4977ae60afed5cbdc51083.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index c40a3c4800b..a2265d5d5b7 100644 --- a/.gitignore +++ b/.gitignore @@ -126,6 +126,7 @@ scripts/mytop scripts/wsrep_sst_common scripts/wsrep_sst_mysqldump scripts/wsrep_sst_rsync +scripts/wsrep_sst_rsync_wan scripts/wsrep_sst_mariabackup scripts/wsrep_sst_xtrabackup scripts/wsrep_sst_xtrabackup-v2 @@ -494,3 +495,9 @@ UpgradeLog*.htm # Microsoft Fakes FakesAssemblies/ + +# macOS garbage +.DS_Store + +# QtCreator && CodeBlocks +*.cbp |