diff options
| author | marha <marha@users.sourceforge.net> | 2011-07-18 10:51:09 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-07-18 10:51:09 +0200 |
| commit | 3c0d2312573b81e3067bea610a58b1940c075e05 (patch) | |
| tree | 3f025a27d813374f225957801226aa8ee829a33a /X11/Makefile.in | |
| parent | ba033884541714680fd7552ab9d6c8817650f7d8 (diff) | |
| parent | 88101146f2ec7d53ffb793e365f05097ffd35fd3 (diff) | |
| download | vcxsrv-3c0d2312573b81e3067bea610a58b1940c075e05.tar.gz vcxsrv-3c0d2312573b81e3067bea610a58b1940c075e05.tar.bz2 vcxsrv-3c0d2312573b81e3067bea610a58b1940c075e05.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
X11/Xfuncproto.h.in
X11/configure.ac
X11/keysymdef.h
freetype/include/freetype/internal/pcftypes.h
freetype/src/cache/ftcbasic.c
freetype/src/cache/ftccmap.c
mesalib/src/glsl/ir.h
mesalib/src/glsl/link_functions.cpp
mesalib/src/mesa/main/dlist.c
mesalib/src/mesa/program/prog_optimize.c
mesalib/src/mesa/state_tracker/st_program.c
pthreads/Makefile
Diffstat (limited to 'X11/Makefile.in')
| -rw-r--r-- | X11/Makefile.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/X11/Makefile.in b/X11/Makefile.in index 814d2dec5..d8f19c0a5 100644 --- a/X11/Makefile.in +++ b/X11/Makefile.in @@ -196,6 +196,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -206,6 +208,7 @@ VERSION = @VERSION@ XMLTO = @XMLTO@ XORG_MAN_PAGE = @XORG_MAN_PAGE@ XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ XSL_STYLESHEET = @XSL_STYLESHEET@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ |