summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <paul@frost.snake.net>2005-03-17 11:43:56 -0600
committerunknown <paul@frost.snake.net>2005-03-17 11:43:56 -0600
commitafe45b7328145a07090fcc2b62d4a72028578aa1 (patch)
tree2b79796ba667c2b62a146e8ee9eab84f537750a6 /BitKeeper
parent05534c4df038c95b03ec4341186d44e81610c4dd (diff)
parent4878bc744990c54a1fce656adc2bdd07d7c9dfcd (diff)
downloadmariadb-git-afe45b7328145a07090fcc2b62d4a72028578aa1.tar.gz
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.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 22f3d495f02..1be3106bdf4 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -110,6 +110,7 @@ nick@mysql.com
nick@nick.leippe.com
patg@krsna.patg.net
paul@central.snake.net
+paul@frost.snake.net
paul@ice.local
paul@ice.snake.net
paul@kite-hub.kitebird.com