summaryrefslogtreecommitdiff
path: root/lisp/private.h
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-04-23 19:54:46 +0000
committerEgbert Eich <eich@suse.de>2004-04-23 19:54:46 +0000
commit9f5d0de96f079e84c648a0173bffac8ec2c3bef5 (patch)
tree1008a7775a52ce81a8b28a5ff5cf2bc58527d5ff /lisp/private.h
parent91547cc15f41faa1a55f2d764f67abd24777e9be (diff)
Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE
Diffstat (limited to 'lisp/private.h')
-rw-r--r--lisp/private.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/private.h b/lisp/private.h
index dd78caa..9df5e3d 100644
--- a/lisp/private.h
+++ b/lisp/private.h
@@ -27,7 +27,8 @@
* Author: Paulo César Pereira de Andrade
*/
-/* $XFree86: xc/programs/xedit/lisp/private.h,v 1.42 2003/12/17 17:45:33 dawes Exp $ */
+/* $XdotOrg: xc/programs/xedit/lisp/private.h,v 1.42 2003/12/17 17:45:33 dawes Exp $ */
+/* $XFree86: xc/programs/xedit/lisp/private.h,v 1.41 2003/05/27 22:27:04 tsi Exp $ */
#ifndef Lisp_private_h
#define Lisp_private_h