summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <mwagner@here.mwagner.org>2004-06-18 15:00:17 -0500
committerunknown <mwagner@here.mwagner.org>2004-06-18 15:00:17 -0500
commitc02eb02cd4e39e5c4f5e3b0a1bd4dc74d8fca2fe (patch)
treecfb94dafb5ead9728661569056e42619b1b0c1ce /BitKeeper
parent20985f3e90a80328c3290b5a630a631337946ea7 (diff)
parent00ad281daeca3d799906b9f28730993d2ada9420 (diff)
downloadmariadb-git-c02eb02cd4e39e5c4f5e3b0a1bd4dc74d8fca2fe.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into here.mwagner.org:/Volumes/BK/mysql-4.0-work 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 d46ab7a3cdf..7a3063c3884 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -87,6 +87,7 @@ monty@tramp.mysql.fi
monty@work.mysql.com
mwagner@cash.mwagner.org
mwagner@evoq.mwagner.org
+mwagner@here.mwagner.org
mwagner@work.mysql.com
mysqldev@build.mysql2.com
nick@mysql.com