diff options
author | unknown <monty@hundin.mysql.fi> | 2001-05-31 12:19:16 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2001-05-31 12:19:16 +0300 |
commit | b369c09dc252e897d367cf0f864141ebd26aba26 (patch) | |
tree | f3386d22e6d91d2fda383ebdb01fdb4614ff56ad /BitKeeper | |
parent | 1158d8a263c750fd96c43a9c6bcc37bba8e9fb5c (diff) | |
parent | b6cae0f64707aca9ec2bbc437f87a84e53fbfec7 (diff) | |
download | mariadb-git-b369c09dc252e897d367cf0f864141ebd26aba26.tar.gz |
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
Docs/manual.texi:
Auto merged
Diffstat (limited to 'BitKeeper')
-rw-r--r-- | BitKeeper/etc/logging_ok | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 0d845c1e172..50fea447bdd 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,2 +1,3 @@ jani@janikt.pp.saunalahti.fi +monty@hundin.mysql.fi mwagner@evoq.mwagner.org |