summaryrefslogtreecommitdiff
path: root/src/mga_merge.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-02-26 09:23:19 +0000
committerEgbert Eich <eich@suse.de>2004-02-26 09:23:19 +0000
commit0d050fbd293089d93bd78b58b1b454dc2ced8cdf (patch)
tree1b1ab3be4e9a2e515ad7271884476d1315ff6273 /src/mga_merge.c
parent64c0cb99b62c87052374f63d3e31e2603eab2f9c (diff)
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
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..afae2cb 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$ */
/* All drivers should typically include these */
#include "xf86.h"