summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-08-24 22:02:08 +0200
committerunknown <serg@serg.mylan>2004-08-24 22:02:08 +0200
commit5e85c2847581ab60d0df772709374acad3c24e3e (patch)
treec12e98359570daf0812e0d7e4bf7fd34e1c36737 /.bzrignore
parentd5996e18edbf0aa2a7f04741751251ab72d31e6f (diff)
parent6564806be70ec3e143f83731199054c68ae8e510 (diff)
downloadmariadb-git-5e85c2847581ab60d0df772709374acad3c24e3e.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1 BitKeeper/etc/ignore: auto-union
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore
index 7d2c00136ef..162872e39cf 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -14,6 +14,7 @@
*/.pure
*~
.*.swp
+./config.h
.defs.mk
.depend
.depend.mk
@@ -830,6 +831,7 @@ support-files/MacOSX/postinstall
support-files/MacOSX/preinstall
support-files/binary-configure
support-files/my-huge.cnf
+support-files/my-innodb-heavy-4G.cnf
support-files/my-large.cnf
support-files/my-medium.cnf
support-files/my-small.cnf
@@ -907,4 +909,3 @@ vio/test-ssl
vio/test-sslclient
vio/test-sslserver
vio/viotest-ssl
-support-files/my-innodb-heavy-4G.cnf