summaryrefslogtreecommitdiff
path: root/BitKeeper/etc
diff options
context:
space:
mode:
authorunknown <acurtis@xiphis.org>2005-04-08 21:40:50 +0100
committerunknown <acurtis@xiphis.org>2005-04-08 21:40:50 +0100
commitbe400cb092574d3b4f81a7e6c0d01759eb34f10a (patch)
tree3066268324dd9b4ccc00382fa9ddb273f7ebb317 /BitKeeper/etc
parent5474a95aa574df8755f88d9c634a1b692ed6f538 (diff)
parent11d36cab93dfca86a818b7f79eacbeaf82d9dbb4 (diff)
downloadmariadb-git-be400cb092574d3b4f81a7e6c0d01759eb34f10a.tar.gz
Merge xiphis.org:/var/db/bk/work-acurtis/bug6776
into xiphis.org:/var/db/bk/work-acurtis/bug6776.1 sql/sql_udf.cc: Auto merged BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
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 9237eea21c4..e4de8c6ebf2 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -8,6 +8,7 @@ Miguel@light.local
Sinisa@sinisa.nasamreza.org
WAX@sergbook.mysql.com
acurtis@pcgem.rdg.cyberkinetica.com
+acurtis@xiphis.org
administrador@light.hegel.local
ahlentz@co3064164-a.rochd1.qld.optusnet.com.au
akishkin@work.mysql.com