summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-09-15 16:24:05 +0300
committerunknown <monty@hundin.mysql.fi>2001-09-15 16:24:05 +0300
commitb7ae610302c4355bd99981ad59ebd0291638b3ca (patch)
tree283613d1cbe615aa39ecd68431356f0e17f4b8a5 /.bzrignore
parent3c360e3ea510c916d0ebda3fbcded31d010d6e6d (diff)
parent7dc2f1a69e61a4370ae06edc77de0fd5bf98e6fb (diff)
downloadmariadb-git-b7ae610302c4355bd99981ad59ebd0291638b3ca.tar.gz
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
BitKeeper/etc/ignore: added vio/test-ssl sql/net_serv.cc: Auto merged
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index fa75e6a1f02..404de44a8f8 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -400,3 +400,4 @@ vio/test-sslserver
vio/viotest-ssl
tools/mysqlmanager
vio/test-ssl
+vio/test-ssl