mariadb/config
unknown 92f698f9f0 Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


config/ac-macros/yassl.m4:
  Auto merged
configure.in:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
extra/yassl/taocrypt/src/Makefile.am:
  Manual merge
2005-10-28 11:45:30 +02:00
..
ac-macros Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985 2005-10-28 11:45:30 +02:00