summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <miguel@light.local>2001-06-29 05:18:58 -0300
committerunknown <miguel@light.local>2001-06-29 05:18:58 -0300
commit7452fb69cd48b1e4f286d8fd535c9366d5ae839b (patch)
tree55e76fcb9abed5d4ff70a161c930cf3ac8ef7143 /BitKeeper
parent62febccfec7e98d0c0a2f06c1662f787bd221dfc (diff)
parent63f3702cda38328b272c84f3fa5a04d0ec19917f (diff)
downloadmariadb-git-7452fb69cd48b1e4f286d8fd535c9366d5ae839b.tar.gz
Merge miguel@work.mysql.com:/home/bk/mysql
into light.local:/home/miguel/bk/mysql BitKeeper/etc/logging_ok: auto-union
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/logging_ok7
1 files changed, 4 insertions, 3 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 7dc05f47709..918f5178951 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -1,9 +1,10 @@
heikki@donna.mysql.fi
jani@janikt.pp.saunalahti.fi
+miguel@light.local
+monty@hundin.mysql.fi
monty@tik.mysql.fi
+monty@work.mysql.com
mwagner@evoq.mwagner.org
+paul@central.snake.net
paul@teton.kitebird.com
-monty@hundin.mysql.fi
sasha@mysql.sashanet.com
-monty@work.mysql.com
-paul@central.snake.net