summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <acurtis@pcgem.rdg.cyberkinetica.com>2004-08-11 23:26:44 +0100
committerunknown <acurtis@pcgem.rdg.cyberkinetica.com>2004-08-11 23:26:44 +0100
commitacf5df3a6d82e83e2a09ce9ae0137e75c370aa23 (patch)
treefad11f8ea53c5a5352a2badbe4282df5a5f7c5e8 /BitKeeper
parent4c6f6c60d5397921fafd91f3d44ffb9c6216cbf1 (diff)
parent4f08c4b72686a258800d950293e2a9827879707e (diff)
downloadmariadb-git-acf5df3a6d82e83e2a09ce9ae0137e75c370aa23.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug4411 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 3ffbead8d68..c4d6b93ffcf 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -5,6 +5,7 @@ Administrator@fred.
Greg@greg-laptop.
Miguel@light.local
Sinisa@sinisa.nasamreza.org
+acurtis@pcgem.rdg.cyberkinetica.com
ahlentz@co3064164-a.rochd1.qld.optusnet.com.au
akishkin@work.mysql.com
antony@ltantony.dsl-verizon.net