summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <jcole@tetra.spaceapes.com>2001-03-02 05:05:06 -0600
committerunknown <jcole@tetra.spaceapes.com>2001-03-02 05:05:06 -0600
commita1a773b509c3fd1d9ce63e9e9b4925a1253aa484 (patch)
treed89a6795c4c9fe53dad9316703e5afaedde45c03 /BitKeeper
parent2ac92eb43c6d1c16ecb24529c5579739b2c352bb (diff)
parent1cd271bd9c3ec591247dfe1295029b90b3a9bc19 (diff)
downloadmariadb-git-a1a773b509c3fd1d9ce63e9e9b4925a1253aa484.tar.gz
Merge work.mysql.com:/home/bk/mysql
into tetra.spaceapes.com:/usr/home/jcole/bk/mysql 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 60e2fb6f24f..f038dce7786 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -1,4 +1,5 @@
heikki@donna.mysql.fi
+jcole@tetra.spaceapes.com
mwagner@evoq.mwagner.org
sasha@mysql.sashanet.com
serg@serg.mysql.com