diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-25 12:10:25 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-25 12:10:25 +0100 |
| commit | 0f333fb1102f4886a8ce39f3c09b12e89e5a7f19 (patch) | |
| tree | 8239768e506a03837019c4f02c8ab949c04a0818 /libX11/src/xlibi18n/Makefile.am | |
| parent | 7dbaa1cffdf176f803f2c7069fb6810e16a86f72 (diff) | |
| parent | a473b885d641b9c1ea57f2ae53f9ba7f2958cce2 (diff) | |
| download | vcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.tar.gz vcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.tar.bz2 vcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 xserver mesa libXinerama libXmu mkfontscale git update 25 nov 2013
Conflicts:
libXinerama/src/Xinerama.c
Diffstat (limited to 'libX11/src/xlibi18n/Makefile.am')
| -rw-r--r-- | libX11/src/xlibi18n/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libX11/src/xlibi18n/Makefile.am b/libX11/src/xlibi18n/Makefile.am index 853953adc..28b3fe3ec 100644 --- a/libX11/src/xlibi18n/Makefile.am +++ b/libX11/src/xlibi18n/Makefile.am @@ -35,8 +35,7 @@ IM_LIBS = \ LC_LIBS = \ ${top_builddir}/modules/lc/def/libxlcDef.la \ ${top_builddir}/modules/lc/gen/libxlibi18n.la \ - ${top_builddir}/modules/lc/Utf8/libxlcUTF8Load.la \ - ${top_builddir}/modules/lc/xlocale/libxlocale.la + ${top_builddir}/modules/lc/Utf8/libxlcUTF8Load.la OM_LIBS = \ ${top_builddir}/modules/om/generic/libxomGeneric.la |