summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <walrus@mysql.com>2002-10-24 23:09:16 +0600
committerunknown <walrus@mysql.com>2002-10-24 23:09:16 +0600
commitdf07abce942ca8a66e32f4c360ad70758df99aed (patch)
tree543de95c58e39e68a616f03347f514eb8befb191 /BitKeeper
parentad25c3b99f31c761b7916594196acf15692f43b7 (diff)
parent7ce04cdad3698f36501b97ba8f7f0ec56b6f525a (diff)
downloadmariadb-git-df07abce942ca8a66e32f4c360ad70758df99aed.tar.gz
Merge
BitKeeper/etc/gone: auto-union BitKeeper/deleted/.del-skipkeys~3f37511a1865c4ea: '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..22422aabdbd 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -32,4 +32,5 @@ serg@build.mysql2.com
serg@serg.mysql.com
serg@sergbook.mysql.com
sinisa@rhols221.adsl.netsonic.fi
+walrus@mysql.com
zak@balfor.local