summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <Administrator@co3064164-a.rochd1.qld.optushome.com.au>2001-10-16 06:58:51 +1000
committerunknown <Administrator@co3064164-a.rochd1.qld.optushome.com.au>2001-10-16 06:58:51 +1000
commiteac41143af064d9e0da03baeadef40cad86e7a5e (patch)
tree1482d1784b47cee8d7d9ca7f04dec7dcfbb68d7b /BitKeeper
parentc7754053b125f1ac4855b3d40b80c126e089b1df (diff)
parent13857c320740b03fa1badd86ad13ec97d89db3ca (diff)
downloadmariadb-git-eac41143af064d9e0da03baeadef40cad86e7a5e.tar.gz
Merge arjen@work.mysql.com:/home/bk/mysql-4.0
into co3064164-a.rochd1.qld.optushome.com.au:c:/home/mysql-4.0 Docs/manual.texi: Auto merged BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/logging_ok2
1 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 981f46c3256..b572006d796 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -31,3 +31,5 @@ tonu@hundin.mysql.fi
tonu@volk.internalnet
tonu@x153.internalnet
tonu@x3.internalnet
+Administrator@co3064164-a.
+Administrator@co3064164-a.rochd1.qld.optushome.com.au