diff options
| author | unknown <monty@donna.mysql.com> | 2000-12-06 01:55:17 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-12-06 01:55:17 +0200 |
| commit | e5c585861e6bf411fd64a18d3a08dbacf039d21a (patch) | |
| tree | bc7ca1a09bd4484fdd30f2f62d7b7d8c23802c4a /BitKeeper | |
| parent | 84eac0e79278f556bd5919397defa990dafa8da9 (diff) | |
| parent | 7bdbe353f8faaafe7b3aa0fde23ba328fe641d31 (diff) | |
| download | mariadb-git-e5c585861e6bf411fd64a18d3a08dbacf039d21a.tar.gz | |
Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql
BitKeeper/etc/logging_ok:
Auto converge
Docs/manual.texi:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index c2a3da12247..d29bd44c29f 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -6,6 +6,7 @@ monty@donna.mysql.com monty@narttu.mysql.fi mwagner@evoq.home.mwagner.org mwagner@work.mysql.com +sasha@donna.mysql.com sasha@laptop.slkc.uswest.net sasha@mysql.sashanet.com sasha@work.mysql.com @@ -14,4 +15,3 @@ tim@threads.polyesthetic.msg tim@work.mysql.com yfaktoro@nbyfaktoro.bedford.progress.com yfaktoro@nslinuxw2.bedford.progress.com -sasha@donna.mysql.com |