summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <salle@geopard.(none)>2002-10-23 23:03:59 +0300
committerunknown <salle@geopard.(none)>2002-10-23 23:03:59 +0300
commit4e2de867b645273da492cc9f51b2fc788df7b4ce (patch)
tree759801cbab6fd028bd9c71536157e2488ee1648e /BitKeeper
parent6f3b5e12865ff2c574cb0efda460d147b7b21dee (diff)
parent2e169a979dc1b7492e3aeede5d2bcbcd52ea221c (diff)
downloadmariadb-git-4e2de867b645273da492cc9f51b2fc788df7b4ce.tar.gz
Merge akeremidarski@work.mysql.com:/home/bk/mysql
into geopard.(none):/storage/bk/mysql-3.23 BitKeeper/etc/gone: auto-union BitKeeper/deleted/.del-skipkeys~508193a0775828ab: 'Auto converge rename' 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 6ffd517a2f7..127fdf89c43 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -26,6 +26,7 @@ nick@mysql.com
nick@nick.leippe.com
paul@central.snake.net
paul@teton.kitebird.com
+salle@geopard.(none)
salle@geopard.online.bg
sasha@mysql.sashanet.com
serg@build.mysql2.com