diff options
| author | tulin@build.mysql.com <> | 2004-05-10 17:40:57 +0200 |
|---|---|---|
| committer | tulin@build.mysql.com <> | 2004-05-10 17:40:57 +0200 |
| commit | ff4018aa8ac58411e76e40f8c06536ef21ae8454 (patch) | |
| tree | 808e79a60bd6ef6a37714172df3a6b1f8c06b1b3 /BitKeeper | |
| parent | 6fffe5907751ad862f4c684bcfc4969ad7d5e6d5 (diff) | |
| parent | bb9f7a9375d7f0bfa08e345d0faf7dfb9a6eb618 (diff) | |
| download | mariadb-git-ff4018aa8ac58411e76e40f8c06536ef21ae8454.tar.gz | |
merge resolve
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 a8379b3d338..35ea9b2f778 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -163,6 +163,7 @@ tonu@hundin.mysql.fi tonu@volk.internalnet tonu@x153.internalnet tonu@x3.internalnet +tulin@build.mysql.com ulli@morbus.(none) venu@hundin.mysql.fi venu@myvenu.com |