diff options
author | unknown <monty@donna.mysql.com> | 2000-12-08 18:39:37 +0200 |
---|---|---|
committer | unknown <monty@donna.mysql.com> | 2000-12-08 18:39:37 +0200 |
commit | 56c1e86d2db760a86a0e28e3769ffc5318c5f23d (patch) | |
tree | 7dd191b124cdfbd78ef11383a9c61cc4ab0149fe /BitKeeper/etc | |
parent | bef71c9a0fa75d61888b8f90717a8ff97124e03b (diff) | |
parent | 19d406d937d9b133c07acf370a5ba3c53bbc2ed7 (diff) | |
download | mariadb-git-56c1e86d2db760a86a0e28e3769ffc5318c5f23d.tar.gz |
Merge
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
SCCS merged
Diffstat (limited to 'BitKeeper/etc')
-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 95b2857507d..b239a449652 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,5 +1,6 @@ jani@prima.mysql.com jani@prima.mysql.fi +monty@donna.mysql.com sasha@mysql.sashanet.com sasha@work.mysql.com serg@serg.mysql.com |