diff options
author | unknown <msvensson@neptunus.(none)> | 2006-09-28 10:39:55 +0200 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2006-09-28 10:39:55 +0200 |
commit | 30af628d374035919c42b4899aa62d979297bfc8 (patch) | |
tree | ee8f4e3518bdfb76221b74cef0fa50a3b5997f54 /.bzrignore | |
parent | 440135998dad8b76c9e698ad80023d2912a1978b (diff) | |
parent | 478965e67d47ce7a12afa4ebd97d0d9e2b5f3f92 (diff) | |
download | mariadb-git-30af628d374035919c42b4899aa62d979297bfc8.tar.gz |
Merge neptunus.(none):/home/msvensson/mysql/netware/my50-netware_libmysql_imp
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
BitKeeper/etc/ignore:
auto-union
netware/Makefile.am:
Auto merged
Diffstat (limited to '.bzrignore')
-rw-r--r-- | .bzrignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index fb8d36adfd2..6abf5d3eb8b 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1734,6 +1734,7 @@ netware/.deps/my_manage.Po netware/.deps/mysql_install_db.Po netware/.deps/mysql_test_run.Po netware/.deps/mysqld_safe.Po +netware/libmysql.imp pack_isam/*.ds? perror/*.ds? perror/*.vcproj |