diff options
| author | marha <marha@users.sourceforge.net> | 2014-09-21 18:14:18 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-09-21 18:14:18 +0200 |
| commit | 4e080e0165d18887e2a0fccd7f30cf20fd04b178 (patch) | |
| tree | dbefa5addb60abe7a5c52dbc1daea7d6e0c9d4d0 /libXfont/src/Makefile.in | |
| parent | e16399e57caac9e859a7d28921c73ef9839b571e (diff) | |
| parent | d0f70707dde032e662dbd5bc70df6ac915403abe (diff) | |
| download | vcxsrv-4e080e0165d18887e2a0fccd7f30cf20fd04b178.tar.gz vcxsrv-4e080e0165d18887e2a0fccd7f30cf20fd04b178.tar.bz2 vcxsrv-4e080e0165d18887e2a0fccd7f30cf20fd04b178.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libXfont/src/fontfile/fontfile.c
libXfont/src/util/utilbitmap.c
Diffstat (limited to 'libXfont/src/Makefile.in')
| -rw-r--r-- | libXfont/src/Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libXfont/src/Makefile.in b/libXfont/src/Makefile.in index 6d92fd150..7396a7d46 100644 --- a/libXfont/src/Makefile.in +++ b/libXfont/src/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -432,7 +432,7 @@ libXfont_la_LIBADD = \ $(FREETYPE_LIBS) $(Z_LIBS) $(MATH_LIBS) $(XFONT_LIBS) libXfont_la_SOURCES = dummy.c -libXfont_la_LDFLAGS = -version-number 1:4:1 +libXfont_la_LDFLAGS = -version-number 1:4:1 -no-undefined all: all-recursive .SUFFIXES: |