diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:55 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:55 +0000 |
| commit | 7306d726bfd8ba10d7ad75f8167dc3ddd85b65e6 (patch) | |
| tree | 169669a985cd3e67d80793f9557c036476db7783 /src/Xv.c | |
| parent | 71d90c59573b4ef0f90e3f9bde03efd6dcf2912e (diff) | |
| download | xorg-lib-libXv-XORG-6_8_99_2.tar.gz | |
Merging XORG-CURRENT into trunksco_port_update-baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_13XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10XORG-6_8_99_1XORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGEXORG-6_8-branch
Diffstat (limited to 'src/Xv.c')
| -rw-r--r-- | src/Xv.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -21,7 +21,8 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xv/Xv.c,v 1.18 2003/11/29 01:02:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xv/Xv.c,v 1.17 2003/04/28 16:56:27 dawes Exp $ */ +/* $XdotOrg: xc/lib/Xv/Xv.c,v 1.18 2003/11/29 01:02:32 dawes Exp $ */ /* ** File: ** |