diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-11-24 19:49:54 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-11-24 19:49:54 -0700 |
| commit | 80db9fb3c95519383bbae73aa8cfc0773bf7c40f (patch) | |
| tree | 96ea4119f650adb324e76291176d8430a3d1e669 /BitKeeper | |
| parent | a750b9862870bed60fa9595bba2fb7213d27ff53 (diff) | |
| parent | 1ef81b2165e5bd416bcb5b6dc91d0cbb64e4af17 (diff) | |
| download | mariadb-git-80db9fb3c95519383bbae73aa8cfc0773bf7c40f.tar.gz | |
Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
BitKeeper/etc/logging_ok:
Auto converge
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 4e4cae6472d..ddf75b2fe6c 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -11,5 +11,5 @@ sasha@work.mysql.com serg@serg.mysql.com tim@threads.polyesthetic.msg tim@work.mysql.com -yfaktoro@nslinuxw2.bedford.progress.com yfaktoro@nbyfaktoro.bedford.progress.com +yfaktoro@nslinuxw2.bedford.progress.com |