diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-09-23 09:48:43 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-09-23 09:48:43 -0400 |
| commit | 7732a5901f8faede18132be2417579a7072ec735 (patch) | |
| tree | 925838ffbe750c1c8dbeb33a36a1640027b07a4d /.bzrignore | |
| parent | d3269f883055564d21dc13640eca7a164d231b15 (diff) | |
| parent | f3172a8957e5c2edde1a5dedb94cd293609933df (diff) | |
| download | mariadb-git-7732a5901f8faede18132be2417579a7072ec735.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
mysql-test/mysql-test-run.pl:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_innodb.cc:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 1d0184fb0f5..7e6c6985e23 100644 --- a/.bzrignore +++ b/.bzrignore @@ -31,6 +31,8 @@ *.vcproj */*.dir/* */*_pure_*warnings +*/.deps +*/.libs/* */.pure */debug/* */release/* |