diff options
author | unknown <tim@threads.polyesthetic.msg> | 2001-02-01 20:50:17 -0500 |
---|---|---|
committer | unknown <tim@threads.polyesthetic.msg> | 2001-02-01 20:50:17 -0500 |
commit | fe87d370ab08de22c8513d52fb211ffa5fe3561b (patch) | |
tree | e551697f42a3ec1c7201c2f6c04250d02edc0132 /BitKeeper | |
parent | 171aa6fe7df167d5433e2ea42b9fa1c2e5fed3ab (diff) | |
parent | a556607baff14099016cda9611b7715fa776f28e (diff) | |
download | mariadb-git-fe87d370ab08de22c8513d52fb211ffa5fe3561b.tar.gz |
Merge work.mysql.com:/home/bk/mysql
into threads.polyesthetic.msg:/usr/local/src/my/work
BitKeeper/etc/logging_ok:
'Auto converge'
Diffstat (limited to 'BitKeeper')
-rw-r--r-- | BitKeeper/etc/logging_ok | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 1931ac4e5ec..f1aadc110a1 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -8,5 +8,5 @@ sasha@work.mysql.com serg@donna.mysql.com serg@serg.mysql.com tim@cane.mysql.fi -tim@work.mysql.com tim@threads.polyesthetic.msg +tim@work.mysql.com |