diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-09-27 22:04:06 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-09-27 22:04:06 +0300 |
| commit | 6ba992fb5da4069b5d77e2cfd143d075a7ce07ee (patch) | |
| tree | 29643689f90cd9881f2e348c43533ec44fdd74fb /BitKeeper | |
| parent | fb70f21989016f7cfdae966b4a1cede67d2ae4c3 (diff) | |
| parent | 0edc02d65348fb3fb1c2d814d8ff5eececdec7cf (diff) | |
| download | mariadb-git-6ba992fb5da4069b5d77e2cfd143d075a7ce07ee.tar.gz | |
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/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 02c76aa4b4a..127056856bb 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,2 +1,3 @@ Miguel@light.local +monty@hundin.mysql.fi paul@central.snake.net |