diff options
author | unknown <tim@threads.polyesthetic.msg> | 2001-04-05 15:25:39 -0400 |
---|---|---|
committer | unknown <tim@threads.polyesthetic.msg> | 2001-04-05 15:25:39 -0400 |
commit | 9d10389a1238cfad6971236f55ee33d228f31cab (patch) | |
tree | 65a20165f805af845527125d8ca46059a5a9eed7 /BitKeeper | |
parent | 27d9f781f25101f62dc175d13f16b2976f2bd551 (diff) | |
parent | 2a4e281c8241636e79f4cf663f2cb8d24d4665dd (diff) | |
download | mariadb-git-9d10389a1238cfad6971236f55ee33d228f31cab.tar.gz |
Merge
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
SCCS merged
Diffstat (limited to 'BitKeeper')
-rw-r--r-- | BitKeeper/etc/logging_ok | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index e51284aa7a8..4367078ef80 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,3 +1,4 @@ heikki@donna.mysql.fi -sasha@mysql.sashanet.com jcole@abel.spaceapes.com +sasha@mysql.sashanet.com +tim@threads.polyesthetic.msg |