diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-10-17 19:40:52 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-10-17 19:40:52 +0300 |
| commit | 02cbb3fa80e1c26897a383a09f1ca08918d2347f (patch) | |
| tree | 76e6f46e7339e37a009a7f50279eb21b26e1cffe /.bzrignore | |
| parent | aeaf3fcf1275c81578594149ffc7a1d6c45c3596 (diff) | |
| parent | 34645e3caf139e02fa5390d3beac12742417d9b5 (diff) | |
| download | mariadb-git-02cbb3fa80e1c26897a383a09f1ca08918d2347f.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
BitKeeper/etc/ignore:
auto-union
Docs/manual.texi:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore index b31b02e2db5..48e46fc082b 100644 --- a/.bzrignore +++ b/.bzrignore @@ -34,6 +34,7 @@ BitKeeper/tmp/bkr3sAHD BitKeeper/tmp/gone COPYING COPYING.LIB +Docs/#manual.texi# Docs/INSTALL-BINARY Docs/include.texi Docs/manual.aux @@ -56,6 +57,7 @@ Docs/manual_letter.ps Docs/manual_toc.html Docs/my_sys.doc Docs/mysql.info +Docs/texi2dvi.out INSTALL-SOURCE Logs/* MIRRORS @@ -180,6 +182,7 @@ gmon.out heap/hp_test1 heap/hp_test2 include/my_config.h +include/my_global.h include/mysql_version.h include/widec.h innobase/conftest.s1 @@ -419,4 +422,3 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl -Docs/#manual.texi# |