summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <monty@tik.mysql.fi>2001-03-23 20:40:31 +0200
committerunknown <monty@tik.mysql.fi>2001-03-23 20:40:31 +0200
commit4ec76c1d2f30fb3a54f7a22476d49a4c0b50f84f (patch)
tree5fb6ceff782cbbea6f80fb0d3559686d0c04a705 /BitKeeper
parent250bb75a50696a2f7c3358684e9d25279f84ad46 (diff)
parentfd433598fefd92904ff65843bd1ff3070604b857 (diff)
downloadmariadb-git-4ec76c1d2f30fb3a54f7a22476d49a4c0b50f84f.tar.gz
Merge work:/my/mysql into tik.mysql.fi:/home/my/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 9f94b7a6bfd..203a12b02f4 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -1 +1,2 @@
+monty@tik.mysql.fi
sasha@mysql.sashanet.com