summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.fi>2001-04-13 12:39:34 +0300
committerunknown <monty@donna.mysql.fi>2001-04-13 12:39:34 +0300
commit0948956b802845699f9868b1e2c6b61a74f36b8d (patch)
treefa1346a4b858344c1283c7f751d9a97ae77bd9f7 /BitKeeper
parentab0338a3981143c8aabbaaf99c43f4275df22ad4 (diff)
parent3e6215d9d080c8f09499fe2693df085754f97d37 (diff)
downloadmariadb-git-0948956b802845699f9868b1e2c6b61a74f36b8d.tar.gz
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
Docs/manual.texi: Auto merged mysql-test/mysql-test-run.sh: Auto merged BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
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 26f1047760f..0df03748a7f 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -1 +1,2 @@
paul@central.snake.net
+monty@donna.mysql.fi