diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-20 11:12:52 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-20 11:12:52 +0000 |
| commit | 439cac06f0d4f641e9c7c0dd6ae62c98ebfd8fa9 (patch) | |
| tree | 793fbb8e2a3630ba56a145f784cbe134800316e7 /libX11/modules/lc/xlocale | |
| parent | 8bbcd844049eb1296ccd25aca75bf3b08f28facb (diff) | |
| parent | a9768b035f2c47be0908520474073cc68d225d8a (diff) | |
| download | vcxsrv-439cac06f0d4f641e9c7c0dd6ae62c98ebfd8fa9.tar.gz vcxsrv-439cac06f0d4f641e9c7c0dd6ae62c98ebfd8fa9.tar.bz2 vcxsrv-439cac06f0d4f641e9c7c0dd6ae62c98ebfd8fa9.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'libX11/modules/lc/xlocale')
| -rw-r--r-- | libX11/modules/lc/xlocale/Makefile.in | 9 | ||||
| -rw-r--r-- | libX11/modules/lc/xlocale/lcEuc.c | 2 | ||||
| -rw-r--r-- | libX11/modules/lc/xlocale/lcJis.c | 2 | ||||
| -rw-r--r-- | libX11/modules/lc/xlocale/lcSjis.c | 2 |
4 files changed, 3 insertions, 12 deletions
diff --git a/libX11/modules/lc/xlocale/Makefile.in b/libX11/modules/lc/xlocale/Makefile.in index e22e71dda..6786fb6d0 100644 --- a/libX11/modules/lc/xlocale/Makefile.in +++ b/libX11/modules/lc/xlocale/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, @@ -160,6 +160,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@ @@ -192,6 +193,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@ @@ -217,16 +219,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@ @@ -251,7 +249,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/modules/lc/xlocale/lcEuc.c b/libX11/modules/lc/xlocale/lcEuc.c index 907c4f04d..442e3090f 100644 --- a/libX11/modules/lc/xlocale/lcEuc.c +++ b/libX11/modules/lc/xlocale/lcEuc.c @@ -1,4 +1,3 @@ -/* $Xorg: lcEuc.c,v 1.3 2000/08/17 19:45:17 cpqbld Exp $ */ /****************************************************************** Copyright 1992, 1993 by FUJITSU LIMITED @@ -30,7 +29,6 @@ OF THIS SOFTWARE. Yoshiyuki Segawa (segawa@ossi.com) *****************************************************************/ -/* $XFree86: xc/lib/X11/lcEuc.c,v 3.12 2003/01/20 04:05:30 dawes Exp $ */ /* * An EUC locale. diff --git a/libX11/modules/lc/xlocale/lcJis.c b/libX11/modules/lc/xlocale/lcJis.c index 06c6b1fd7..594e6363c 100644 --- a/libX11/modules/lc/xlocale/lcJis.c +++ b/libX11/modules/lc/xlocale/lcJis.c @@ -1,4 +1,3 @@ -/* $Xorg: lcJis.c,v 1.3 2000/08/17 19:45:18 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -23,7 +22,6 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/lcJis.c,v 1.9 2002/04/10 16:20:06 tsi Exp $ */ /* * A Japanese JIS locale. diff --git a/libX11/modules/lc/xlocale/lcSjis.c b/libX11/modules/lc/xlocale/lcSjis.c index c4b607650..74dd033ec 100644 --- a/libX11/modules/lc/xlocale/lcSjis.c +++ b/libX11/modules/lc/xlocale/lcSjis.c @@ -1,4 +1,3 @@ -/* $Xorg: lcSjis.c,v 1.3 2000/08/17 19:45:19 cpqbld Exp $ */ /**************************************************************** Copyright 1992, 1993 by FUJITSU LIMITED @@ -35,7 +34,6 @@ OR PERFORMANCE OF THIS SOFTWARE. makoto@sm.sony.co.jp *****************************************************************/ -/* $XFree86: xc/lib/X11/lcSjis.c,v 3.9 2002/04/10 16:20:06 tsi Exp $ */ /* * A Japanese SJIS locale. |