diff options
| author | unknown <tim@cane.mysql.fi> | 2001-01-15 14:43:51 +0200 |
|---|---|---|
| committer | unknown <tim@cane.mysql.fi> | 2001-01-15 14:43:51 +0200 |
| commit | 22f568dc0d8e27442b1c0b2c5a0b6bf35c88401c (patch) | |
| tree | 5b766066385cbbda2a9d66a1e57fd654a24b0319 /BitKeeper | |
| parent | 9df06f293a14c61adaae26f2d6e7721a609779b2 (diff) | |
| parent | 3158ea85b4ce5ebc8c9ca7d6e9eb98e5de562828 (diff) | |
| download | mariadb-git-22f568dc0d8e27442b1c0b2c5a0b6bf35c88401c.tar.gz | |
Merge work.mysql.com:/home/bk/mysql
into cane.mysql.fi:/usr/home/tim/my/work
BitKeeper/etc/logging_ok:
'Auto converge'
Docs/manual.texi:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 3eed9d57f5d..8a1bc880f7c 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,2 +1,5 @@ mwagner@evoq.home.mwagner.org +sasha@mysql.sashanet.com +sasha@work.mysql.com serg@hynda.mysql.fi +tim@cane.mysql.fi |