summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <antony@ltantony.mysql.com>2005-05-08 01:20:47 +0100
committerunknown <antony@ltantony.mysql.com>2005-05-08 01:20:47 +0100
commitfcf18772dde963cc564d21ef89824a82a9d60771 (patch)
tree2655abade8eeba5ea33ecced844be53429ed684d /BitKeeper
parent39f8776f897c6eb394f3b07b09e515c9fc1c2c81 (diff)
parent9a8e31a426e2f937bfcd744d9b9b02d464383549 (diff)
downloadmariadb-git-fcf18772dde963cc564d21ef89824a82a9d60771.tar.gz
Merge ltantony.mysql.com:/usr/home/antony/work2/fixbuild-4.1
into ltantony.mysql.com:/usr/home/antony/work2/fixbuild-5.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 101e845ccf1..6a17f69a0d8 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -15,6 +15,7 @@ ahlentz@co3064164-a.rochd1.qld.optusnet.com.au
akishkin@work.mysql.com
anjuta@arthur.local
antony@ltantony.dsl-verizon.net
+antony@ltantony.mysql.com
antony@ltantony.rdg.cyberkinetica.com
antony@ltantony.rdg.cyberkinetica.homeunix.net
arjen@bitbike.com