aboutsummaryrefslogtreecommitdiff
path: root/libX11/src/util
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-01-19 23:10:44 +0000
committermarha <marha@users.sourceforge.net>2010-01-19 23:10:44 +0000
commita9768b035f2c47be0908520474073cc68d225d8a (patch)
treef9894781b3f1d5b36d5a5fa284c82ad36c9cf917 /libX11/src/util
parentb152ebf4b66368e1cbfda1ae81cef29bf9c00bb7 (diff)
downloadvcxsrv-a9768b035f2c47be0908520474073cc68d225d8a.tar.gz
vcxsrv-a9768b035f2c47be0908520474073cc68d225d8a.tar.bz2
vcxsrv-a9768b035f2c47be0908520474073cc68d225d8a.zip
Updated to:
libX11-1.3.3 pixman-0.17.4
Diffstat (limited to 'libX11/src/util')
-rw-r--r--libX11/src/util/Makefile.am1
-rw-r--r--libX11/src/util/Makefile.in11
-rw-r--r--libX11/src/util/makekeys.c3
3 files changed, 3 insertions, 12 deletions
diff --git a/libX11/src/util/Makefile.am b/libX11/src/util/Makefile.am
index c9e81c044..7fc8da5c4 100644
--- a/libX11/src/util/Makefile.am
+++ b/libX11/src/util/Makefile.am
@@ -1,4 +1,3 @@
-# $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
noinst_PROGRAMS=makekeys
diff --git a/libX11/src/util/Makefile.in b/libX11/src/util/Makefile.in
index 88e217bf1..6fee791b5 100644
--- a/libX11/src/util/Makefile.in
+++ b/libX11/src/util/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,8 +15,6 @@
@SET_MAKE@
-# $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
-
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
@@ -133,6 +131,7 @@ GREP = @GREP@
GROFF = @GROFF@
I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
INSTALL = @INSTALL@
+INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -165,6 +164,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
@@ -190,16 +190,12 @@ X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
XDMCP_CFLAGS = @XDMCP_CFLAGS@
XDMCP_LIBS = @XDMCP_LIBS@
XERRORDB = @XERRORDB@
-XKBPROTO_CFLAGS = @XKBPROTO_CFLAGS@
-XKBPROTO_LIBS = @XKBPROTO_LIBS@
XKBPROTO_REQUIRES = @XKBPROTO_REQUIRES@
XKEYSYMDB = @XKEYSYMDB@
XLOCALEDATADIR = @XLOCALEDATADIR@
XLOCALEDIR = @XLOCALEDIR@
XLOCALELIBDIR = @XLOCALELIBDIR@
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
-XPROTO_CFLAGS = @XPROTO_CFLAGS@
-XPROTO_LIBS = @XPROTO_LIBS@
XTHREADLIB = @XTHREADLIB@
XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
@@ -224,7 +220,6 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
-distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
diff --git a/libX11/src/util/makekeys.c b/libX11/src/util/makekeys.c
index 3fe8a96e6..1c27e6b21 100644
--- a/libX11/src/util/makekeys.c
+++ b/libX11/src/util/makekeys.c
@@ -1,5 +1,3 @@
-/* $Xorg: makekeys.c,v 1.5 2001/02/09 02:03:40 $ */
-/* $XdotOrg: lib/X11/src/util/makekeys.c,v 1.5 2005-07-03 07:00:56 daniels Exp $ */
/*
Copyright 1990, 1998 The Open Group
@@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: $ */
/* Constructs hash tables for XStringToKeysym and XKeysymToString. */