diff options
| author | unknown <serg@serg.mysql.com> | 2001-01-28 13:22:45 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2001-01-28 13:22:45 +0100 |
| commit | 12fd55a5a65dd3d6e6f1ba883d20a86a74aa8d2d (patch) | |
| tree | edea1c6df56ede3f17603d63518b406cec3159ad /BitKeeper | |
| parent | 214366fd6df1a79caf2863d95c4248316cb20d42 (diff) | |
| parent | 7a70b21271ed43a1f5a9c95af574a5203d1d2079 (diff) | |
| download | mariadb-git-12fd55a5a65dd3d6e6f1ba883d20a86a74aa8d2d.tar.gz | |
Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 1052cc254f3..fa533a6aed7 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,9 +1,10 @@ jcole@tetra.spaceapes.com monty@donna.mysql.com +monty@work.mysql.com mwagner@work.mysql.com paul@central.snake.net sasha@mysql.sashanet.com sasha@work.mysql.com serg@donna.mysql.com +serg@serg.mysql.com tim@cane.mysql.fi -monty@work.mysql.com |