summaryrefslogtreecommitdiff
path: root/src/mga_merge.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-02-26 13:35:53 +0000
committerEgbert Eich <eich@suse.de>2004-02-26 13:35:53 +0000
commitddb58a6e1be274dce96cc7c29965a45c2294c5d3 (patch)
tree74afef7eee3ae9f95fad4888d3565e1ff88c5899 /src/mga_merge.c
parent0d050fbd293089d93bd78b58b1b454dc2ced8cdf (diff)
readding XFree86's cvs IDsxf86-4_3_99_903
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 afae2cb..ab3d20e 100644
--- a/src/mga_merge.c
+++ b/src/mga_merge.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_merge.c,v 1.5 2003/11/02 04:24:36 dawes Exp $ */
/* All drivers should typically include these */
#include "xf86.h"