diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-06 16:24:16 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-06 16:24:16 +0200 |
| commit | 074c68409921032f8a64416cc4d5ebc35d95dca9 (patch) | |
| tree | 615c99d326fd2ce8c0e3b533b40f0e4e3475bbc1 /.gitignore | |
| parent | 563efeceece09154f71da6303244b1df36875428 (diff) | |
| parent | df563e0c037f9b2cdb22e145575f92a121b4b529 (diff) | |
| download | mariadb-git-074c68409921032f8a64416cc4d5ebc35d95dca9.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index bb393224588..2ae0a2332fd 100644 --- a/.gitignore +++ b/.gitignore @@ -262,6 +262,7 @@ storage/mroonga/vendor/groonga/src/groonga-benchmark storage/mroonga/vendor/groonga/src/suggest/groonga-suggest-create-dataset storage/mroonga/mysql-test/mroonga/storage/r/information_schema_plugins.result storage/mroonga/mysql-test/mroonga/storage/r/variable_version.result +zlib/zconf.h xxx/* yyy/* zzz/* |