summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2005-02-18 11:02:21 +0100
committerunknown <msvensson@neptunus.(none)>2005-02-18 11:02:21 +0100
commit2b1b463cd82a2763493738cd8f4c767bb0659430 (patch)
tree55819eab576fc15adadd5fff9c5e9e6e3f88dc0d /BitKeeper
parentc2e18c5061e24fcafed4bb4f58ef41b6b0a52fcc (diff)
parent07e4dc1cd876af6a505879bc7c3f2dbef737275f (diff)
downloadmariadb-git-2b1b463cd82a2763493738cd8f4c767bb0659430.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-8583 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 5acd00e6604..e6292a20347 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -155,6 +155,7 @@ mronstrom@mysql.com
mskold@bk-internal.mysql.com
mskold@mysql.com
msvensson@build.mysql.com
+msvensson@neptunus.(none)
msvensson@neptunus.homeip.net
mwagner@cash.mwagner.org
mwagner@evoq.mwagner.org