diff options
| author | unknown <jcole@tetra.spaceapes.com> | 2000-09-25 14:26:15 -0500 |
|---|---|---|
| committer | unknown <jcole@tetra.spaceapes.com> | 2000-09-25 14:26:15 -0500 |
| commit | 88b79d22001baa7da82fe1b6f2dab3ebf56ed5ac (patch) | |
| tree | fdfd1bb6e38fc7ed3eed107bb5954687a999e375 /BitKeeper | |
| parent | d7a8efc3b76c3961e9e81fbde4e0d85e1363b976 (diff) | |
| parent | 2fdf8e6b7e06390036f40e11b3e334cf131d6b7a (diff) | |
| download | mariadb-git-88b79d22001baa7da82fe1b6f2dab3ebf56ed5ac.tar.gz | |
Merge jcole@work.mysql.com:/home/bk/mysql
into tetra.spaceapes.com:/usr/home/jcole/bk/mysql
BitKeeper/etc/logging_ok:
Auto merged
Docs/manual.texi:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 4c82a23befa..45e2ab005d2 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -3,12 +3,14 @@ davida@work.mysql.com jamppa@work.mysql.com jcole@ham.spaceapes.com jcole@jcole.burghcom.com +jcole@nslinux.bedford.progress.com jcole@tetra.bedford.progress.com jcole@tetra.spaceapes.com matt@work.mysql.com -mwagner@evoq.home.mwagner.org monty@donna.mysql.com monty@work.mysql.com +mwagner@evoq.home.mwagner.org +nusphere@main.burghcom.com paul@central.snake.net paul@work.mysql.com sasha@mysql.sashanet.com @@ -19,5 +21,3 @@ sinisa@work.mysql.com tim@localhost.polyesthetic.msg tim@work.mysql.com tonu@work.mysql.com -jcole@nslinux.bedford.progress.com -nusphere@main.burghcom.com |