diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:44 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:44 +0000 |
| commit | 2ffea633871eb30a17b37d5ae35cbf998e6bfb63 (patch) | |
| tree | 44a767546075981208dcfb359d73ea27c073a7fd /src/xvmc | |
| parent | 71687eeaa94c5b1ce1fbb11ff27d4e69c73a4a1d (diff) | |
18. Merged in XFree86 code up to 4.4.0 including changes to files thatXPRINT_BASEXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASEIPv6-REVIEW
had a changed license. There was only one change which happened to
be from me (Egbert Eich).
Diffstat (limited to 'src/xvmc')
| -rw-r--r-- | src/xvmc/I810XvMC.c | 2 | ||||
| -rw-r--r-- | src/xvmc/I810XvMC.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/xvmc/I810XvMC.c b/src/xvmc/I810XvMC.c index e6731c62..fdafe8cb 100644 --- a/src/xvmc/I810XvMC.c +++ b/src/xvmc/I810XvMC.c @@ -33,7 +33,7 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. ** ** ***************************************************************************/ -/* $XFree86: xc/lib/XvMC/hw/i810/I810XvMC.c,v 1.11 2002/11/19 09:35:49 alanh Exp $ */ +/* $XFree86: xc/lib/XvMC/hw/i810/I810XvMC.c,v 1.10 2002/10/30 12:52:01 alanh Exp $ */ #include <stdio.h> #include <stdlib.h> #include <unistd.h> diff --git a/src/xvmc/I810XvMC.h b/src/xvmc/I810XvMC.h index 018c80e9..cfcab88f 100644 --- a/src/xvmc/I810XvMC.h +++ b/src/xvmc/I810XvMC.h @@ -32,7 +32,7 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. * * ***************************************************************************/ -/* $XFree86: xc/lib/XvMC/hw/i810/I810XvMC.h,v 1.4 2002/11/19 09:35:49 alanh Exp $ */ +/* $XFree86: xc/lib/XvMC/hw/i810/I810XvMC.h,v 1.3 2002/10/30 12:52:02 alanh Exp $ */ #ifndef I810XVMC_H |