diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-10-23 15:59:24 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-10-23 15:59:24 +0200 |
| commit | f9e5195b40b4b6678b71fdac2b99442664037d36 (patch) | |
| tree | 8da99e7722c1f587c93a65fdc2a465992ec68b82 /.gitignore | |
| parent | 55fc3fb08830cfe8e55b45f5f0e1acf55d00cb4b (diff) | |
| parent | bac287c315b1792e7ae33f91add6a60292f9bae8 (diff) | |
| download | mariadb-git-f9e5195b40b4b6678b71fdac2b99442664037d36.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 5f2bf5a0fcd..c374f5f9689 100644 --- a/.gitignore +++ b/.gitignore @@ -236,6 +236,7 @@ storage/mroonga/vendor/groonga/src/grnslap storage/mroonga/vendor/groonga/src/groonga storage/mroonga/vendor/groonga/src/groonga-benchmark storage/mroonga/vendor/groonga/src/suggest/groonga-suggest-create-dataset +zlib/zconf.h # macOS garbage .DS_Store |