summaryrefslogtreecommitdiff
path: root/src/mga_merge.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-14 08:33:25 +0000
committerEgbert Eich <eich@suse.de>2004-03-14 08:33:25 +0000
commitf02d171b227e657f02a0b99a28cff7cbda21a583 (patch)
tree3f4c5b7c7969e7dc0a368e6535714e6313467378 /src/mga_merge.c
parentd8072750f830173e3c9eefae8364d12190b20c26 (diff)
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004xf86-4_4_99_1
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 b06466c..ab3d20e 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.4 2003/09/24 02:43:24 dawes Exp $ */
+/* $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"