From fd8bbba2f02b8bccd69e67c326fd320c0827941d Mon Sep 17 00:00:00 2001 From: Mageia SVN-Git Migration Date: Sun, 6 Feb 2011 22:37:08 +0000 Subject: Synthesized commit during git-svn import combining previous Mandriva history with Mageia. This commit consitsts of the following subversion commits: ------------------------------------------------------------------------ r431 | dmorgan | 2011-02-06 01:58:02 +0000 (Sun, 06 Feb 2011) | 1 line Add drakx structure on the SVN ------------------------------------------------------------------------ r432 | dmorgan | 2011-02-06 01:59:38 +0000 (Sun, 06 Feb 2011) | 1 line Import cleaned advertising ------------------------------------------------------------------------ r446 | dmorgan | 2011-02-06 22:37:08 +0000 (Sun, 06 Feb 2011) | 1 line Import Clean perl-install ------------------------------------------------------------------------ r448 | dmorgan | 2011-02-06 23:02:36 +0000 (Sun, 06 Feb 2011) | 1 line Add cleaned files ------------------------------------------------------------------------ r449 | dmorgan | 2011-02-06 23:03:52 +0000 (Sun, 06 Feb 2011) | 1 line Import cleaned kernel ------------------------------------------------------------------------ r450 | dmorgan | 2011-02-06 23:23:30 +0000 (Sun, 06 Feb 2011) | 1 line Import cleaned tools ------------------------------------------------------------------------ r451 | dmorgan | 2011-02-07 00:01:56 +0000 (Mon, 07 Feb 2011) | 1 line Import stage1 ------------------------------------------------------------------------ r473 | dmorgan | 2011-02-07 11:20:50 +0000 (Mon, 07 Feb 2011) | 1 line Import images ------------------------------------------------------------------------ r497 | ennael | 2011-02-09 21:02:06 +0000 (Wed, 09 Feb 2011) | 2 lines readd missing file ------------------------------------------------------------------------ r502 | pterjan | 2011-02-09 23:30:32 +0000 (Wed, 09 Feb 2011) | 1 line Import rescue ------------------------------------------------------------------------ r603 | ennael | 2011-02-24 13:32:54 +0000 (Thu, 24 Feb 2011) | 2 lines import cleaned rescue for Mageia ------------------------------------------------------------------------ r2061 | tv | 2011-10-20 20:32:19 +0100 (Thu, 20 Oct 2011) | 1 line import (cleaned) doc ------------------------------------------------------------------------ --- mdk-stage1/ppp/pppdump/Makefile.sol2 | 2 +- mdk-stage1/ppp/pppdump/Makefile.sunos4 | 2 +- mdk-stage1/ppp/pppdump/bsd-comp.c | 2 +- mdk-stage1/ppp/pppdump/deflate.c | 2 +- mdk-stage1/ppp/pppdump/ppp-comp.h | 2 +- mdk-stage1/ppp/pppdump/pppdump.8 | 2 +- mdk-stage1/ppp/pppdump/zlib.c | 2 +- mdk-stage1/ppp/pppdump/zlib.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'mdk-stage1/ppp/pppdump') diff --git a/mdk-stage1/ppp/pppdump/Makefile.sol2 b/mdk-stage1/ppp/pppdump/Makefile.sol2 index d7e6b413e..bbd07ebff 100644 --- a/mdk-stage1/ppp/pppdump/Makefile.sol2 +++ b/mdk-stage1/ppp/pppdump/Makefile.sol2 @@ -1,6 +1,6 @@ # # pppdump Makefile for SVR4 systems -# $Id$ +# $Id: Makefile.sol2 195720 2001-06-11 11:44:34Z gc $ # include ../solaris/Makedefs diff --git a/mdk-stage1/ppp/pppdump/Makefile.sunos4 b/mdk-stage1/ppp/pppdump/Makefile.sunos4 index 915c8267d..5f60f747c 100644 --- a/mdk-stage1/ppp/pppdump/Makefile.sunos4 +++ b/mdk-stage1/ppp/pppdump/Makefile.sunos4 @@ -1,6 +1,6 @@ # # pppstats makefile -# $Id$ +# $Id: Makefile.sunos4 195720 2001-06-11 11:44:34Z gc $ # include ../sunos4/Makedefs diff --git a/mdk-stage1/ppp/pppdump/bsd-comp.c b/mdk-stage1/ppp/pppdump/bsd-comp.c index 1e14e98bb..cf3c18d35 100644 --- a/mdk-stage1/ppp/pppdump/bsd-comp.c +++ b/mdk-stage1/ppp/pppdump/bsd-comp.c @@ -38,7 +38,7 @@ */ /* - * $Id$ + * $Id: bsd-comp.c 195720 2001-06-11 11:44:34Z gc $ */ #include diff --git a/mdk-stage1/ppp/pppdump/deflate.c b/mdk-stage1/ppp/pppdump/deflate.c index 08e8abc0d..812905bfe 100644 --- a/mdk-stage1/ppp/pppdump/deflate.c +++ b/mdk-stage1/ppp/pppdump/deflate.c @@ -25,7 +25,7 @@ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, * OR MODIFICATIONS. * - * $Id$ + * $Id: deflate.c 195720 2001-06-11 11:44:34Z gc $ */ #include diff --git a/mdk-stage1/ppp/pppdump/ppp-comp.h b/mdk-stage1/ppp/pppdump/ppp-comp.h index 9221c0db4..7608c393d 100644 --- a/mdk-stage1/ppp/pppdump/ppp-comp.h +++ b/mdk-stage1/ppp/pppdump/ppp-comp.h @@ -24,7 +24,7 @@ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, * OR MODIFICATIONS. * - * $Id$ + * $Id: ppp-comp.h 195720 2001-06-11 11:44:34Z gc $ */ #ifndef _NET_PPP_COMP_H diff --git a/mdk-stage1/ppp/pppdump/pppdump.8 b/mdk-stage1/ppp/pppdump/pppdump.8 index c0172f519..b908eeed7 100644 --- a/mdk-stage1/ppp/pppdump/pppdump.8 +++ b/mdk-stage1/ppp/pppdump/pppdump.8 @@ -1,4 +1,4 @@ -.\" @(#) $Id$ +.\" @(#) $Id: pppdump.8 195720 2001-06-11 11:44:34Z gc $ .TH PPPDUMP 8 "1 April 1999" .SH NAME pppdump \- convert PPP record file to readable format diff --git a/mdk-stage1/ppp/pppdump/zlib.c b/mdk-stage1/ppp/pppdump/zlib.c index 5b8372719..8b6a8a138 100644 --- a/mdk-stage1/ppp/pppdump/zlib.c +++ b/mdk-stage1/ppp/pppdump/zlib.c @@ -11,7 +11,7 @@ * - added Z_PACKET_FLUSH (see zlib.h for details) * - added inflateIncomp * - * $Id$ + * $Id: zlib.c 195720 2001-06-11 11:44:34Z gc $ */ diff --git a/mdk-stage1/ppp/pppdump/zlib.h b/mdk-stage1/ppp/pppdump/zlib.h index 9c7ac734d..b4a7d91a9 100644 --- a/mdk-stage1/ppp/pppdump/zlib.h +++ b/mdk-stage1/ppp/pppdump/zlib.h @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id: zlib.h 195720 2001-06-11 11:44:34Z gc $ */ /* * This file is derived from zlib.h and zconf.h from the zlib-0.95 -- cgit v1.2.1