summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <serg@sergbook.mylan>2003-06-23 12:49:38 +0200
committerunknown <serg@sergbook.mylan>2003-06-23 12:49:38 +0200
commit209d8a4e57bbd20edb6077c2c2448705de5d8168 (patch)
tree6d1c59f13f9ef4cdc3ea7bec79bc4287614efbe7 /BitKeeper
parentba49cc62b0b4a60868765e2192f9b3571ab96b65 (diff)
parent09c7b48d43b13d7e292b79b8abd2ed2a1490715f (diff)
downloadmariadb-git-209d8a4e57bbd20edb6077c2c2448705de5d8168.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into sergbook.mylan:/usr/home/serg/Abk/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 9a826cffbfc..89f03d96369 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -85,6 +85,7 @@ sasha@mysql.sashanet.com
serg@build.mysql2.com
serg@serg.mylan
serg@serg.mysql.com
+serg@sergbook.mylan
serg@sergbook.mysql.com
sinisa@rhols221.adsl.netsonic.fi
tfr@beta.frontier86.ee