summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorcmiller@zippy.(none) <>2006-06-20 17:17:04 -0400
committercmiller@zippy.(none) <>2006-06-20 17:17:04 -0400
commitdeca07bdccd91598e060b6c3f093eefca95d66da (patch)
treee00305ac71067ad01c53c30eeb4904036cd3351a /.bzrignore
parent337396d19aba98daa0d2b496f7e280971adac5c8 (diff)
parentb0ebd2fce0ad62aec70d65bee6a6e8a04fdcac52 (diff)
downloadmariadb-git-deca07bdccd91598e060b6c3f093eefca95d66da.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maint
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index eafc384fda5..ef02a085144 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1285,3 +1285,4 @@ vio/viotest-sslconnect.cpp
vio/viotest.cpp
zlib/*.ds?
zlib/*.vcproj
+BitKeeper/etc/RESYNC_TREE