summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-06-11 15:07:43 +0300
committerunknown <monty@hundin.mysql.fi>2001-06-11 15:07:43 +0300
commit8b76fb7f3ef18727fcc1b06733fd190a0741a321 (patch)
tree7a4dfcffeed3cfda1da5e12ef7c4019aa5993c9f /BitKeeper
parent036396bc666abaa317dfd3cc700fc5fe77db9cc4 (diff)
parent44b670f650dbcac6426f635caefeb15851614842 (diff)
downloadmariadb-git-8b76fb7f3ef18727fcc1b06733fd190a0741a321.tar.gz
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted Docs/manual.texi: Auto merged
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 39de42e998d..d5d02afc3d1 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -3,3 +3,4 @@ jani@janikt.pp.saunalahti.fi
monty@tik.mysql.fi
mwagner@evoq.mwagner.org
paul@teton.kitebird.com
+monty@hundin.mysql.fi