diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:59 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:59 +0000 |
| commit | dcb9cd54937e935f224c6779ee68cf995b309e74 (patch) | |
| tree | 494c4d880eee90c18a69a888f949fd811ead6ba7 /src/via_priv.h | |
| parent | 27f4b11a328477df142798fb881a37cbf7b30fa3 (diff) | |
18. Merged in XFree86 code up to 4.4.0 including changes to files that had
a changed license. There was only one change which happened to be from
me (Egbert Eich).
Diffstat (limited to 'src/via_priv.h')
| -rw-r--r-- | src/via_priv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/via_priv.h b/src/via_priv.h index 1e8a726..0afea8d 100644 --- a/src/via_priv.h +++ b/src/via_priv.h @@ -1,5 +1,5 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/via/via_priv.h,v 1.4 2003/12/17 18:57:18 dawes Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/via/via_priv.h,v 1.4 2003/12/17 18:57:18 dawes Exp $ */ +: /* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/via/via_priv.h,v 1.4 2003/12/17 18:57:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/via/via_priv.h,v 1.3 2003/08/27 15:16:12 tsi Exp $ */ #ifndef _VIA_PRIV_H_ #define _VIA_PRIV_H_ 1 |