summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorunknown <serg@serg.mysql.com>2002-11-09 19:27:28 +0100
committerunknown <serg@serg.mysql.com>2002-11-09 19:27:28 +0100
commit773fd5f2a1b1373ecd3efdba9521149ca43a365f (patch)
tree9c6220f28c17e47d47999739488cef272093ffc4 /.bzrignore
parent7ee75d7a9275b11df8878c5b6fbcd402d23120ba (diff)
parent8c14ed4230fb808c4bc5d7664345a909eb190520 (diff)
downloadmariadb-git-773fd5f2a1b1373ecd3efdba9521149ca43a365f.tar.gz
merged
BitKeeper/etc/ignore: auto-union
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore5
1 files changed, 3 insertions, 2 deletions
diff --git a/.bzrignore b/.bzrignore
index c0a91201e29..d1ea6c7d70e 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -193,6 +193,7 @@ configure
core
db-*.*.*
dbug/user.t
+depcomp
extra/comp_err
extra/my_print_defaults
extra/mysql_install
@@ -211,6 +212,7 @@ innobase/conftest.s1
innobase/conftest.subs
innobase/ib_config.h
innobase/ib_config.h.in
+innobase/stamp-h1
isam/isamchk
isam/isamlog
isam/pack_isam
@@ -468,6 +470,7 @@ sql/sql_yacc.cc
sql/sql_yacc.h
stamp-h
stamp-h.in
+stamp-h1
strings/conf_to_src
strings/ctype_autoconf.c
strings/ctype_extra_sources.c
@@ -494,5 +497,3 @@ vio/test-ssl
vio/test-sslclient
vio/test-sslserver
vio/viotest-ssl
-innobase/stamp-h1
-stamp-h1