summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <tim@work.mysql.com>2001-08-09 21:24:11 +0200
committerunknown <tim@work.mysql.com>2001-08-09 21:24:11 +0200
commit70e03a2661a0570f63f79baa0627b583751aa3db (patch)
treebb0bc3e68ba21af2fca587688c79810f0e4ff119 /BitKeeper
parent799bf1cdb61e64c5e551ce6a7791df275a1f9071 (diff)
parenteff8ec494f54791b95e32d080a7ae14510b6b92e (diff)
downloadmariadb-git-70e03a2661a0570f63f79baa0627b583751aa3db.tar.gz
Merge work.mysql.com:/home/bk/mysql into work.mysql.com:/home/tim/my/3
BitKeeper/etc/logging_ok: auto-union
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/logging_ok2
1 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 0bc2e507968..49e1ef3cafd 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -1,2 +1,4 @@
+heikki@donna.mysql.fi
jani@hynda.mysql.fi
+jcole@tetra.spaceapes.com
tim@work.mysql.com