summaryrefslogtreecommitdiff
path: root/iplan2p4/iplmergerop.h
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-03 12:12:50 +0000
committerEgbert Eich <eich@suse.de>2004-03-03 12:12:50 +0000
commit867451f1ab7b9870621725bd4be3dd8694c364b8 (patch)
treeb64281ced76a5e339f5407e59467b37ba2cf2b1d /iplan2p4/iplmergerop.h
parent2934f0731b3d2bc9c1e25ceab26d9e0d9cadb054 (diff)
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004xf86-4_4_0STSF-CURRENT
Diffstat (limited to 'iplan2p4/iplmergerop.h')
-rw-r--r--iplan2p4/iplmergerop.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/iplan2p4/iplmergerop.h b/iplan2p4/iplmergerop.h
index fa537d3a7..22f3b4d5f 100644
--- a/iplan2p4/iplmergerop.h
+++ b/iplan2p4/iplmergerop.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplmergerop.h,v 3.1 2001/07/25 15:05:09 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/iplan2p4/iplmergerop.h,v 3.0 1996/08/18 01:54:53 dawes Exp $ */
#ifndef _IPLANMERGEROP_H_
#define _IPLANMERGEROP_H_