summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2000-12-15 16:18:00 +0200
committerunknown <monty@donna.mysql.com>2000-12-15 16:18:00 +0200
commit68d0f88c5e85c412ba2539e7e107a6de54e03af5 (patch)
tree9a2b6170f02f0aca853d98a59720a9258c7d851a /BitKeeper
parent7322a906a860c9aa17ba3bf681f65b2d7f2497ee (diff)
parentbf4fb50fb4b0979b5e30e83e0189ff5d314530f5 (diff)
downloadmariadb-git-68d0f88c5e85c412ba2539e7e107a6de54e03af5.tar.gz
merge
BitKeeper/etc/logging_ok: auto-union
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/logging_ok1
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 78d75d783d2..f8b6948642e 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -7,3 +7,4 @@ paul@central.snake.net
sasha@mysql.sashanet.com
sasha@work.mysql.com
serg@serg.mysql.com
+tim@cane.mysql.fi