diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-06 08:41:48 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-06 08:41:48 +0200 |
| commit | 32062cc61cd00e4cd3b7939c8a09f9c3ac34ec76 (patch) | |
| tree | 098d64b7c988bab8cca25b0f716d92f6f7e72ed9 /.gitignore | |
| parent | af9649c722810eb1754953eb406a84ec876ce693 (diff) | |
| parent | bae21bfb5de17328c33c3da8d191c6d3af14ae02 (diff) | |
| download | mariadb-git-32062cc61cd00e4cd3b7939c8a09f9c3ac34ec76.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index a2265d5d5b7..786c87767d7 100644 --- a/.gitignore +++ b/.gitignore @@ -259,6 +259,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/* |