summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <tim@hundin.mysql.fi>2001-06-05 04:18:23 +0300
committerunknown <tim@hundin.mysql.fi>2001-06-05 04:18:23 +0300
commitdb6d4e9faa10316d04a942eb6454470ff0c86951 (patch)
tree38a5cd43a0bac54f27d50d8f049f6c1ff61dc94c /BitKeeper
parent53b24302185eb7cc9e3481fd48dc91f633e445c2 (diff)
parentd637e1dcd5b2bec697e1fab2118ba9ffc88afcb5 (diff)
downloadmariadb-git-db6d4e9faa10316d04a942eb6454470ff0c86951.tar.gz
Merge work:/my/mysql-4.0 into hundin.mysql.fi:/home/tim/mysql-4.0
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 c3d008f6c0c..74fb8f1f4c4 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -7,5 +7,6 @@ paul@central.snake.net
paul@teton.kitebird.com
sasha@mysql.sashanet.com
serg@serg.mysql.com
+tim@hundin.mysql.fi
tim@threads.polyesthetic.msg
tonu@hundin.mysql.fi