diff options
author | unknown <peter@mysql.com> | 2002-07-19 00:06:33 +0400 |
---|---|---|
committer | unknown <peter@mysql.com> | 2002-07-19 00:06:33 +0400 |
commit | b8fc29540a6bafb6393eff8e892a420df4585ae6 (patch) | |
tree | 1d0d925463ce81700e27f6fc5069b0abeecbd37f /BitKeeper | |
parent | 641d725dcb7cfe3cc881c921ff94c382f18774b2 (diff) | |
parent | c78629effba2b232c5afada4b2e839a1580c0ea8 (diff) | |
download | mariadb-git-b8fc29540a6bafb6393eff8e892a420df4585ae6.tar.gz |
Merge changes in docs do go further
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Automerge (Arjen please check)
Diffstat (limited to 'BitKeeper')
-rw-r--r-- | BitKeeper/etc/logging_ok | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index f649231e247..b42fbc64c53 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -45,7 +45,10 @@ nick@nick.leippe.com paul@central.snake.net paul@teton.kitebird.com peter@linux.local +peter@mysql.com root@x3.internalnet +salle@geopard.(none) +salle@geopard.online.bg sasha@mysql.sashanet.com serg@serg.mysql.com serg@sergbook.mysql.com @@ -64,10 +67,8 @@ tonu@volk.internalnet tonu@x153.internalnet tonu@x3.internalnet venu@work.mysql.com +walrus@mysql.com worm@altair.is.lan zak@balfor.local zak@linux.local -salle@geopard.(none) -walrus@mysql.com zgreant@mysql.com -salle@geopard.online.bg |