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
This commit is contained in:
unknown 2006-09-28 10:39:55 +02:00
commit 30af628d37
3 changed files with 15 additions and 87 deletions

View file

@ -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