summaryrefslogtreecommitdiff
path: root/mi/mipushpxl.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-04-23 19:54:30 +0000
committerEgbert Eich <eich@suse.de>2004-04-23 19:54:30 +0000
commit2fb588620030ad393f8500d60e16144d59e4effe (patch)
tree07262cbe15a40e5aeae54f62751260f83243ab79 /mi/mipushpxl.c
parent0664db19bf37f9dd69cca6adff4e238e310c3092 (diff)
Merging XORG-CURRENT into trunk
Diffstat (limited to 'mi/mipushpxl.c')
-rw-r--r--mi/mipushpxl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mi/mipushpxl.c b/mi/mipushpxl.c
index 0c8d32ae6..019ba437e 100644
--- a/mi/mipushpxl.c
+++ b/mi/mipushpxl.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mipushpxl.c,v 3.13 2003/07/16 01:38:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mipushpxl.c,v 3.12 2001/12/14 20:00:26 dawes Exp $ */
/***********************************************************
Copyright 1987, 1998 The Open Group