diff options
| author | unknown <joreland@mysql.com> | 2004-11-15 10:50:58 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-11-15 10:50:58 +0100 |
| commit | 74735b3d86f6282bd0594d906666a531afe749bb (patch) | |
| tree | dfe96c812edcc7a5446f9b7043351e8f119bb717 /BitKeeper | |
| parent | 8f145e4cbd5151155132a127434390218c0cf2e8 (diff) | |
| parent | 20cfd8fd4e4167ddc5b0b7b1d447fa7f3ed0be6a (diff) | |
| download | mariadb-git-74735b3d86f6282bd0594d906666a531afe749bb.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/wl1744
BitKeeper/etc/logging_ok:
auto-union
configure.in:
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 2750c41a0df..36abd73fccf 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -196,6 +196,7 @@ tim@bitch.mysql.fi tim@black.box tim@hundin.mysql.fi tim@sand.box +tim@siva.hindu.god tim@threads.polyesthetic.msg tim@white.box tim@work.mysql.com |