diff options
author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-10-31 08:46:37 +0200 |
---|---|---|
committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-10-31 08:46:37 +0200 |
commit | d6ee7ab1a1cec0143e66f3ac75d8cee7c60f69b0 (patch) | |
tree | 3db0ed5372812c7eaa6754db689f1baa6418c572 /.gitignore | |
parent | b0fe082b365d989fcf905e5c40c3fe60fd756858 (diff) | |
parent | a737135ae39dafe8b1136386ce23dfa8bed877f9 (diff) | |
download | mariadb-git-d6ee7ab1a1cec0143e66f3ac75d8cee7c60f69b0.tar.gz |
Merge remote-tracking branch 'origin/10.0' into bb-10.0-galera
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 8c9b4acec5e..620e91c0a4c 100644 --- a/.gitignore +++ b/.gitignore @@ -233,6 +233,7 @@ 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 + # C and C++ # Compiled Object files |