diff options
| author | unknown <monty@tik.mysql.com> | 2000-12-15 11:09:15 +0200 |
|---|---|---|
| committer | unknown <monty@tik.mysql.com> | 2000-12-15 11:09:15 +0200 |
| commit | e7fde22e1a2e8e1eb1ea122a6b5f97786453200a (patch) | |
| tree | 9cfc1d788d705118f7d0ef103b447ec48c587d6b /BitKeeper | |
| parent | 4a063ba73bc659f29810b1e5961bd4ce819daa7d (diff) | |
| parent | e1e7ba756a609f9e78d4cbf8291b7f1859df4425 (diff) | |
| download | mariadb-git-e7fde22e1a2e8e1eb1ea122a6b5f97786453200a.tar.gz | |
Merge narttu:/my/mysql into tik.mysql.com:/home/my/mysql
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index db73e909995..78d75d783d2 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,6 +1,7 @@ jani@prima.mysql.com jani@prima.mysql.fi monty@donna.mysql.com +monty@tik.mysql.com monty@work.mysql.com paul@central.snake.net sasha@mysql.sashanet.com |