diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-01-18 10:24:40 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-01-18 10:24:40 -0700 |
| commit | b86f79e050ce743798fd1e3053c61ee29e6d757f (patch) | |
| tree | 920f91935acacdd5b9b9afd1790386af6e099a56 | |
| parent | d303c5054b6044efbd8afec4152b5ca463c558ec (diff) | |
| parent | 136715ea16b53107780e99a78fad0568836f0cac (diff) | |
| download | mariadb-git-b86f79e050ce743798fd1e3053c61ee29e6d757f.tar.gz | |
Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
Docs/manual.texi:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
| -rw-r--r-- | BitKeeper/etc/logging_ok | 9 | ||||
| -rw-r--r-- | Docs/manual.texi | 6 |
2 files changed, 4 insertions, 11 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index e29072f333b..97122c10a0d 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,9 +1,2 @@ -jani@hynda.mysql.fi -monty@donna.mysql.com -mwagner@evoq.home.mwagner.org +mwagner@work.mysql.com sasha@mysql.sashanet.com -sasha@work.mysql.com -serg@hynda.mysql.fi -tim@cane.mysql.fi -tim@donna.mysql.com -jcole@tetra.spaceapes.com diff --git a/Docs/manual.texi b/Docs/manual.texi index 0ba29080db0..0dcb3bd1290 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -4621,11 +4621,11 @@ Please report bad or out-of-date mirrors to @email{webmaster@@mysql.com}. @c removed because ftp was not working 990729 & 30 @c @uref{ftp://mysql.bluep.com/pub/mirror1/mysql/, FTP} -@item +@c @item @c Added 990531 @c EMAIL: gavin@itworks.com.au (Gavin Cameron) -@image{Flags/australia} Australia [ITworks Consulting/Victoria] @ -@uref{http://mysql.itworks.com.au, WWW} +@c @image{Flags/australia} Australia [ITworks Consulting/Victoria] @ +@c @uref{http://mysql.itworks.com.au, WWW} @c @item @c 980610 Only the toplevel dir! |