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/include/net/if_ppp.h | 2 +- mdk-stage1/ppp/include/net/ppp-comp.h | 2 +- mdk-stage1/ppp/include/net/ppp_defs.h | 2 +- mdk-stage1/ppp/include/net/pppio.h | 2 +- mdk-stage1/ppp/include/net/slcompress.h | 2 +- mdk-stage1/ppp/include/net/vjcompress.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'mdk-stage1/ppp/include/net') diff --git a/mdk-stage1/ppp/include/net/if_ppp.h b/mdk-stage1/ppp/include/net/if_ppp.h index 1527ecf3f..c64484e84 100644 --- a/mdk-stage1/ppp/include/net/if_ppp.h +++ b/mdk-stage1/ppp/include/net/if_ppp.h @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id: if_ppp.h 195720 2001-06-11 11:44:34Z gc $ */ /* * if_ppp.h - Point-to-Point Protocol definitions. diff --git a/mdk-stage1/ppp/include/net/ppp-comp.h b/mdk-stage1/ppp/include/net/ppp-comp.h index 0e6a9c672..30b0def68 100644 --- a/mdk-stage1/ppp/include/net/ppp-comp.h +++ b/mdk-stage1/ppp/include/net/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/include/net/ppp_defs.h b/mdk-stage1/ppp/include/net/ppp_defs.h index 46bef52bb..ecd0528ec 100644 --- a/mdk-stage1/ppp/include/net/ppp_defs.h +++ b/mdk-stage1/ppp/include/net/ppp_defs.h @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id: ppp_defs.h 203043 2003-06-04 18:31:57Z gbeauchesne $ */ /* * ppp_defs.h - PPP definitions. diff --git a/mdk-stage1/ppp/include/net/pppio.h b/mdk-stage1/ppp/include/net/pppio.h index 9db1ca9ab..e327db3ce 100644 --- a/mdk-stage1/ppp/include/net/pppio.h +++ b/mdk-stage1/ppp/include/net/pppio.h @@ -24,7 +24,7 @@ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, * OR MODIFICATIONS. * - * $Id$ + * $Id: pppio.h 195720 2001-06-11 11:44:34Z gc $ */ #define _PPPIO(n) (('p' << 8) + (n)) diff --git a/mdk-stage1/ppp/include/net/slcompress.h b/mdk-stage1/ppp/include/net/slcompress.h index 9e19bc0ed..d7b7dc4ee 100644 --- a/mdk-stage1/ppp/include/net/slcompress.h +++ b/mdk-stage1/ppp/include/net/slcompress.h @@ -1,7 +1,7 @@ /* * Definitions for tcp compression routines. * - * $Id$ + * $Id: slcompress.h 195720 2001-06-11 11:44:34Z gc $ * * Copyright (c) 1989 Regents of the University of California. * All rights reserved. diff --git a/mdk-stage1/ppp/include/net/vjcompress.h b/mdk-stage1/ppp/include/net/vjcompress.h index c64596926..0ff6d3943 100644 --- a/mdk-stage1/ppp/include/net/vjcompress.h +++ b/mdk-stage1/ppp/include/net/vjcompress.h @@ -1,7 +1,7 @@ /* * Definitions for tcp compression routines. * - * $Id$ + * $Id: vjcompress.h 195720 2001-06-11 11:44:34Z gc $ * * Copyright (c) 1989 Regents of the University of California. * All rights reserved. -- cgit v1.2.1