summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorsasha@laptop.slkc.uswest.net <>2000-11-11 15:15:27 -0700
committersasha@laptop.slkc.uswest.net <>2000-11-11 15:15:27 -0700
commit00a4a502185c23c0864fda1466082e01242a188c (patch)
tree2f8706d2c3ad7d144fba44d7c66af687edaf5724 /BitKeeper
parentb873d68ad1de93f4a31f8772251f9c3cad458d8b (diff)
parentdd3c64a4ef9fe76be6ebf598c8ea4debf61b980c (diff)
downloadmariadb-git-00a4a502185c23c0864fda1466082e01242a188c.tar.gz
Merge work.mysql.com:/home/bk/mysql
into laptop.slkc.uswest.net:/home/sasha/src/mysql
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 a432c58eaa8..cebcc21e1fe 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -1,4 +1,5 @@
jcole@tetra.bedford.progress.com
+sasha@laptop.slkc.uswest.net
sasha@mysql.sashanet.com
sasha@work.mysql.com
serg@serg.mysql.com