diff options
| author | unknown <monty@donna.mysql.com> | 2000-11-17 14:39:26 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-11-17 14:39:26 +0200 |
| commit | 19fc413aa25290016069efbc9e25e2e79b3ea7c9 (patch) | |
| tree | a149e4ce9e9d7f49d34261056fa0e1893a5b118b /BitKeeper | |
| parent | 645cfcb142a0a2532a180106308163a613f323ca (diff) | |
| parent | 3f9c19dcf6188194fa351ecccdad843cbbf987df (diff) | |
| download | mariadb-git-19fc413aa25290016069efbc9e25e2e79b3ea7c9.tar.gz | |
Merge work:/home/bk/mysql into donna.mysql.com:/home/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 328eb654350..8de11b4fe16 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,3 +1,4 @@ +jani@prima.mysql.com monty@donna.mysql.com monty@narttu.mysql.fi mwagner@work.mysql.com |