summaryrefslogtreecommitdiff
path: root/src/mga_merge.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-03 12:12:19 +0000
committerEgbert Eich <eich@suse.de>2004-03-03 12:12:19 +0000
commitd8072750f830173e3c9eefae8364d12190b20c26 (patch)
treebfc99c3d4bdcc4ef6bb59fcca5294ef1f49e1fec /src/mga_merge.c
parentddb58a6e1be274dce96cc7c29965a45c2294c5d3 (diff)
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004xf86-4_4_0STSF-CURRENT
Diffstat (limited to 'src/mga_merge.c')
-rw-r--r--src/mga_merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mga_merge.c b/src/mga_merge.c
index ab3d20e..b06466c 100644
--- a/src/mga_merge.c
+++ b/src/mga_merge.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_merge.c,v 1.5 2003/11/02 04:24:36 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_merge.c,v 1.4 2003/09/24 02:43:24 dawes Exp $ */
/* All drivers should typically include these */
#include "xf86.h"