diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 18:54:16 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 18:54:16 +0000 |
| commit | 0664db19bf37f9dd69cca6adff4e238e310c3092 (patch) | |
| tree | d2cc9d3132d40796018a853df38877fa5b027f18 /Xext/xvmain.c | |
| parent | 9d24a5fa91bf165bbd2048a844edeb59b5e34aad (diff) | |
Merging XORG-CURRENT into trunk
Diffstat (limited to 'Xext/xvmain.c')
| -rw-r--r-- | Xext/xvmain.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Xext/xvmain.c b/Xext/xvmain.c index 2c3f484bd..e95bbe390 100644 --- a/Xext/xvmain.c +++ b/Xext/xvmain.c @@ -1,3 +1,4 @@ +/* $XdotOrg$ */ /*********************************************************** Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts, and the Massachusetts Institute of Technology, Cambridge, Massachusetts. @@ -21,7 +22,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/xvmain.c,v 1.16 2003/10/28 23:08:44 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xvmain.c,v 1.15tsi Exp $ */ /* ** File: |