summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <tim@work.mysql.com>2001-01-23 00:03:07 +0100
committerunknown <tim@work.mysql.com>2001-01-23 00:03:07 +0100
commita63e2096e576aa97c3097872eddc85142850bda9 (patch)
treeccf66f4d2e50bb931af73d69135113c3ad086697 /BitKeeper
parenta9674081c586d3974bb9a020f68d64dafd41cfb8 (diff)
parente4667fc51861263cdc46f59cb09d6def8edd6daf (diff)
downloadmariadb-git-a63e2096e576aa97c3097872eddc85142850bda9.tar.gz
Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/d1/users/tim/my/work BitKeeper/etc/logging_ok: Auto converge
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/logging_ok2
1 files changed, 1 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 63914eee80c..0de2e6a29f2 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -1,10 +1,10 @@
jcole@tetra.spaceapes.com
monty@donna.mysql.com
+monty@work.mysql.com
mwagner@work.mysql.com
paul@central.snake.net
sasha@mysql.sashanet.com
sasha@work.mysql.com
serg@donna.mysql.com
tim@cane.mysql.fi
-monty@work.mysql.com
tim@work.mysql.com