summaryrefslogtreecommitdiff
path: root/mfb/mergerop.h
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-03 12:12:50 +0000
committerEgbert Eich <eich@suse.de>2004-03-03 12:12:50 +0000
commit867451f1ab7b9870621725bd4be3dd8694c364b8 (patch)
treeb64281ced76a5e339f5407e59467b37ba2cf2b1d /mfb/mergerop.h
parent2934f0731b3d2bc9c1e25ceab26d9e0d9cadb054 (diff)
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004xf86-4_4_0STSF-CURRENT
Diffstat (limited to 'mfb/mergerop.h')
-rw-r--r--mfb/mergerop.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/mfb/mergerop.h b/mfb/mergerop.h
index ee3a33fe9..e54e1f906 100644
--- a/mfb/mergerop.h
+++ b/mfb/mergerop.h
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
*
* Author: Keith Packard, MIT X Consortium
*/
-/* $XFree86: xc/programs/Xserver/mfb/mergerop.h,v 3.14 2001/12/14 20:00:03 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/mergerop.h,v 3.13 2001/10/28 03:34:13 tsi Exp $ */
#ifndef _MERGEROP_H_
#define _MERGEROP_H_