diff options
| author | unknown <monty@narttu.mysql.fi> | 2002-04-26 14:20:56 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2002-04-26 14:20:56 +0300 |
| commit | 9dc655e17b5b0c4b38bdf946e1ce612fec3933a4 (patch) | |
| tree | fdff5cf968429ac7983bbc53ee1816ca0845cbcc /BitKeeper | |
| parent | 2ddd3d219d2cc797b236faaab95449905b4402b2 (diff) | |
| parent | a754c6a968ac5d036bb88b14026ae9c41c301da3 (diff) | |
| download | mariadb-git-9dc655e17b5b0c4b38bdf946e1ce612fec3933a4.tar.gz | |
Merge hundin:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0
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 afc5fd90fee..cc350302aeb 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -27,6 +27,7 @@ miguel@light.local monty@bitch.mysql.fi monty@donna.mysql.fi monty@hundin.mysql.fi +monty@narttu.mysql.fi monty@tik.mysql.fi monty@tramp.mysql.fi monty@work.mysql.com |