aboutsummaryrefslogtreecommitdiff
path: root/libX11/src/Xrm.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-01-20 11:12:52 +0000
committermarha <marha@users.sourceforge.net>2010-01-20 11:12:52 +0000
commit439cac06f0d4f641e9c7c0dd6ae62c98ebfd8fa9 (patch)
tree793fbb8e2a3630ba56a145f784cbe134800316e7 /libX11/src/Xrm.c
parent8bbcd844049eb1296ccd25aca75bf3b08f28facb (diff)
parenta9768b035f2c47be0908520474073cc68d225d8a (diff)
downloadvcxsrv-439cac06f0d4f641e9c7c0dd6ae62c98ebfd8fa9.tar.gz
vcxsrv-439cac06f0d4f641e9c7c0dd6ae62c98ebfd8fa9.tar.bz2
vcxsrv-439cac06f0d4f641e9c7c0dd6ae62c98ebfd8fa9.zip
svn merge ^/branches/released .
Diffstat (limited to 'libX11/src/Xrm.c')
-rw-r--r--libX11/src/Xrm.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libX11/src/Xrm.c b/libX11/src/Xrm.c
index 46bc31daa..21f0af3c0 100644
--- a/libX11/src/Xrm.c
+++ b/libX11/src/Xrm.c
@@ -1,4 +1,3 @@
-/* $Xorg: Xrm.c,v 1.7 2001/02/09 02:03:39 xorgcvs Exp $ */
/***********************************************************
Copyright 1987, 1988, 1990 by Digital Equipment Corporation, Maynard
@@ -49,7 +48,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/Xrm.c,v 3.22 2003/07/16 01:38:26 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>