diff options
| author | unknown <msvensson@shellback.(none)> | 2006-09-21 20:31:35 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-09-21 20:31:35 +0200 |
| commit | 6630bd03d681478d8f8c28eb2425adf393e3ddfc (patch) | |
| tree | 70a547d6a8d443558875c52c13c416324d21a4cb /.bzrignore | |
| parent | e6b102e7deb33258a40de3f58f56f7711cb25f55 (diff) | |
| parent | ee5ffff9e7c24fc1a9df9466454d98d90fb32a24 (diff) | |
| download | mariadb-git-6630bd03d681478d8f8c28eb2425adf393e3ddfc.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
mysql-test/t/disabled.def:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/errmsg.txt:
Auto merged
storage/innobase/Makefile.am:
Auto merged
storage/innobase/handler/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 869852b36fe..fb8d36adfd2 100644 --- a/.bzrignore +++ b/.bzrignore @@ -34,6 +34,8 @@ *.vcproj */*.dir/* */*_pure_*warnings +*/.deps +*/.libs/* */.pure */debug/* */release/* |