summaryrefslogtreecommitdiff
path: root/BitKeeper/etc
diff options
context:
space:
mode:
authorunknown <reggie@monster.>2005-06-02 12:36:55 -0500
committerunknown <reggie@monster.>2005-06-02 12:36:55 -0500
commitfec4347fb33d94a216c9a17b0fd37be7c9b157e8 (patch)
tree6f4d33cd5a73a3f2cc72d481a029c768e42f916d /BitKeeper/etc
parent33b114aac25c787ca6a49a099c14af765c19a71b (diff)
parentdd3225b22bf8b478361ac795b9f067f4993fd384 (diff)
downloadmariadb-git-fec4347fb33d94a216c9a17b0fd37be7c9b157e8.tar.gz
Merge monster.:D:/Work/mysql-4.1 into monster.:D:/Work/mysql5.0
BitKeeper/etc/logging_ok: auto-union
Diffstat (limited to 'BitKeeper/etc')
-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 5b842d47fdc..eaf79d29cee 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -237,6 +237,7 @@ rburnett@bk-internal.mysql.com
rburnett@build.mysql.com
reggie@bob.(none)
reggie@mdk10.(none)
+reggie@monster.
root@home.(none)
root@mc04.(none)
root@x3.internalnet