diff options
| author | hf@deer.mysql.r18.ru <> | 2002-12-12 12:49:56 +0400 |
|---|---|---|
| committer | hf@deer.mysql.r18.ru <> | 2002-12-12 12:49:56 +0400 |
| commit | 3517febe97fcea4b90f42da0630cd376425026ab (patch) | |
| tree | 15affb8818d0219c1b4f8fb6c72b3226bc757ef7 /BitKeeper | |
| parent | 0d77a0cafdddda857fdb5e5ea2a81d5cb24069ea (diff) | |
| parent | dcb5293576d2fc7b36400823e8f18011e49f23b3 (diff) | |
| download | mariadb-git-3517febe97fcea4b90f42da0630cd376425026ab.tar.gz | |
Resolving merge conflicts
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index c424926a248..1fbd6e2db92 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -21,6 +21,9 @@ heikki@donna.mysql.fi heikki@hundin.mysql.fi heikki@rescue. heikki@work.mysql.com +hf@bison.(none) +hf@bisonxp.(none) +hf@deer.mysql.r18.ru hf@genie.(none) jani@dsl-jkl1657.dial.inet.fi jani@hynda.(none) |