summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <jani@ibmlab.site>2005-05-06 13:42:30 +0300
committerunknown <jani@ibmlab.site>2005-05-06 13:42:30 +0300
commit0baed276c312dd2e277e0e029f290510c6bdd4d9 (patch)
tree306bed84ef44d0bc505a17cdf0c2f268407ccf06 /BitKeeper
parent70bf6fd2849170cc1a8c5c5bb109391775c02e73 (diff)
parentfc80e4c121926b9eec6bf03dfeba634270a308e5 (diff)
downloadmariadb-git-0baed276c312dd2e277e0e029f290510c6bdd4d9.tar.gz
Merge ibmlab.site:/home/my/bk/mysql-4.1
into ibmlab.site:/home/my/bk/mysql-5.0 BitKeeper/etc/logging_ok: auto-union
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/logging_ok1
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index ee552def442..55477fe5d22 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -97,6 +97,7 @@ jani@dsl-jkl1657.dial.inet.fi
jani@dsl-kpogw4gb5.dial.inet.fi
jani@hynda.(none)
jani@hynda.mysql.fi
+jani@ibmlab.site
jani@janikt.pp.saunalahti.fi
jani@linux.local
jani@rhols221.adsl.netsonic.fi