summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2000-12-26 17:35:48 +0200
committerunknown <monty@donna.mysql.com>2000-12-26 17:35:48 +0200
commit74bb64d30480d34407cbaee4ef969910d2c14d9f (patch)
tree7d5482b675df974ad486aff70513b273b718fe60 /.bzrignore
parent3417bf64020c91fba71149dcb979069768898be9 (diff)
parentd70e5caa4f5386e604aae972c713854fc35acf7a (diff)
downloadmariadb-git-74bb64d30480d34407cbaee4ef969910d2c14d9f.tar.gz
Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql
BitKeeper/etc/ignore: added sql-bench/output/* Docs/manual.texi: Auto merged
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index 47b47611d1d..6d77ebb79c8 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -181,3 +181,5 @@ mysql-test/mysql-test-run
BitKeeper/tmp/gone
mysqld.S
mysqld.sym
+.snprj/*
+sql-bench/output/*