diff options
author | Michael Widenius <monty@askmonty.org> | 2013-03-01 18:09:06 +0200 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2013-03-01 18:09:06 +0200 |
commit | 4cace76d4d3d75cf94762497937479c475d12167 (patch) | |
tree | 9c7bad491bb0762dfb460bdd9dc9c58b840a3e49 /.bzrignore | |
parent | 492c3b09d2b3c11ebb043276ff4b245d54d99fd0 (diff) | |
parent | 8ed283d882e7147b1caa3f90f708720c94446024 (diff) | |
download | mariadb-git-4cace76d4d3d75cf94762497937479c475d12167.tar.gz |
Automatic merge
Diffstat (limited to '.bzrignore')
-rw-r--r-- | .bzrignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 74c81c48e05..57209c72b87 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1143,3 +1143,4 @@ sql/db.opt ./_CPack_Packages ./install_manifest_*.txt typescript +mysql-test/collections/default.release.done |