summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <paul@teton.kitebird.com>2001-06-08 11:01:49 -0500
committerunknown <paul@teton.kitebird.com>2001-06-08 11:01:49 -0500
commit8b204f16fa8c4dfc170f67274df0c52bd00e544b (patch)
tree132fc1d557c477e677c63b888d47e14c8d49505d /BitKeeper
parent0f9b1363b3a0f8368b03d4320351924d9ef4ced2 (diff)
parentf00c02293db7b344bef6eb8f3a9fab976707bc10 (diff)
downloadmariadb-git-8b204f16fa8c4dfc170f67274df0c52bd00e544b.tar.gz
Merge paul@work.mysql.com:/home/bk/mysql
into teton.kitebird.com:/home/paul/mysql BitKeeper/etc/logging_ok: auto-union
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/logging_ok3
1 files changed, 2 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 139241f6b88..1d132989aef 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -1,2 +1,3 @@
-jani@janikt.pp.saunalahti.fi
heikki@donna.mysql.fi
+jani@janikt.pp.saunalahti.fi
+paul@teton.kitebird.com