summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <marko@hundin.mysql.fi>2005-03-15 14:40:16 +0200
committerunknown <marko@hundin.mysql.fi>2005-03-15 14:40:16 +0200
commitc8e834e995712cf695ce6bef5362be54f77ad774 (patch)
tree51216dcfd12d0f584a7684eede9989497a6f0743 /BitKeeper
parent10852be938b545af8a60b5357686d6f695932e89 (diff)
parent6d0ec316a84fc85d8e327dafdf30aaccb0024b34 (diff)
downloadmariadb-git-c8e834e995712cf695ce6bef5362be54f77ad774.tar.gz
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
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 f8621170f64..ef04f36c433 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -112,6 +112,7 @@ paul@central.snake.net
paul@ice.local
paul@ice.snake.net
paul@kite-hub.kitebird.com
+paul@snake-hub.snake.net
paul@teton.kitebird.com
pem@mysql.com
peter@linux.local