summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <ulli@morbus.(none)>2004-03-01 11:24:10 +0100
committerunknown <ulli@morbus.(none)>2004-03-01 11:24:10 +0100
commit1c44237c0eb1224f34ed606b92cec7f08085b11f (patch)
tree220abe5897059b5d11637616cf277b77b79835b3 /BitKeeper
parentcae2503b0b2eff4e8256d67fca66de904fbfe34d (diff)
parentbf53c870499fac500ef34f0880a4da18c08e417d (diff)
downloadmariadb-git-1c44237c0eb1224f34ed606b92cec7f08085b11f.tar.gz
Merge ubayer@bk-internal.mysql.com:/home/bk/mysql-4.0
into morbus.(none):/home/ulli/work/mysql-4.0 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 dda23f91e70..63db9c29c60 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -2,6 +2,7 @@ Administrador@light.
Administrator@co3064164-a.
Administrator@co3064164-a.rochd1.qld.optushome.com.au
Administrator@fred.
+Greg@greg-laptop.
Miguel@light.local
Sinisa@sinisa.nasamreza.org
ahlentz@co3064164-a.rochd1.qld.optusnet.com.au