diff options
| author | unknown <jani@janikt.pp.saunalahti.fi> | 2001-05-23 02:40:21 +0300 |
|---|---|---|
| committer | unknown <jani@janikt.pp.saunalahti.fi> | 2001-05-23 02:40:21 +0300 |
| commit | 28b812212d39bf0c5b586b4812498bde5ac2ac6a (patch) | |
| tree | f371bd4419f6a844b1dc9631dcdaabd83ab57417 /BitKeeper/etc/logging_ok | |
| parent | 6906a7893c2c0fbbbc2234d8dbbe4c4543df16c9 (diff) | |
| parent | 46ea783d2e776c2ee9564bfdde9e9dc5b62c5c6c (diff) | |
| download | mariadb-git-28b812212d39bf0c5b586b4812498bde5ac2ac6a.tar.gz | |
Merge jamppa@work:/home/bk/mysql
into janikt.pp.saunalahti.fi:/home/my/bk/mysql
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
Diffstat (limited to 'BitKeeper/etc/logging_ok')
| -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 01a1261eae5..2c3ae485b23 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1 +1,2 @@ +jani@janikt.pp.saunalahti.fi monty@tik.mysql.fi |