diff options
| author | Zou Nan hai <nanhai.zou@intel.com> | 2009-05-18 17:11:28 +0800 |
|---|---|---|
| committer | Zou Nan hai <nanhai.zou@intel.com> | 2009-05-18 17:11:28 +0800 |
| commit | 50c10ededba15dd0c118f1b65756362061491090 (patch) | |
| tree | afc01093ef9c472e9c0b0f0630635486058a95c3 /src/xvmc | |
| parent | 13c730e003e805e19deee0996b2af30f69e54c4d (diff) | |
| parent | 87332a7cc16af82aa47e07fbf90da3635b071dbf (diff) | |
Merge branch 'master' into xvmc-vld
Diffstat (limited to 'src/xvmc')
| -rw-r--r-- | src/xvmc/I810XvMC.c | 1 | ||||
| -rw-r--r-- | src/xvmc/I810XvMC.h | 1 | ||||
| -rw-r--r-- | src/xvmc/xf86dri.c | 1 | ||||
| -rw-r--r-- | src/xvmc/xf86dri.h | 1 | ||||
| -rw-r--r-- | src/xvmc/xf86dristr.h | 1 |
5 files changed, 0 insertions, 5 deletions
diff --git a/src/xvmc/I810XvMC.c b/src/xvmc/I810XvMC.c index 10606de4..0754ff44 100644 --- a/src/xvmc/I810XvMC.c +++ b/src/xvmc/I810XvMC.c @@ -33,7 +33,6 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. ** ** ***************************************************************************/ -/* $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 b71d6215..9de32eba 100644 --- a/src/xvmc/I810XvMC.h +++ b/src/xvmc/I810XvMC.h @@ -32,7 +32,6 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. * * ***************************************************************************/ -/* $XFree86: xc/lib/XvMC/hw/i810/I810XvMC.h,v 1.3 2002/10/30 12:52:02 alanh Exp $ */ #ifndef I810XVMC_H diff --git a/src/xvmc/xf86dri.c b/src/xvmc/xf86dri.c index 96987bfa..9ea919af 100644 --- a/src/xvmc/xf86dri.c +++ b/src/xvmc/xf86dri.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/lib/GL/dri/XF86dri.c,v 1.13 2002/10/30 12:51:25 alanh Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/src/xvmc/xf86dri.h b/src/xvmc/xf86dri.h index 81cfdfdd..5b8655de 100644 --- a/src/xvmc/xf86dri.h +++ b/src/xvmc/xf86dri.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/lib/GL/dri/xf86dri.h,v 1.8 2002/10/30 12:51:25 alanh Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/src/xvmc/xf86dristr.h b/src/xvmc/xf86dristr.h index 3b43438e..d8989963 100644 --- a/src/xvmc/xf86dristr.h +++ b/src/xvmc/xf86dristr.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/lib/GL/dri/xf86dristr.h,v 1.10 2002/10/30 12:51:25 alanh Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. |