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/makefile | |
| 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/makefile')
| -rw-r--r-- | libX11/makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libX11/makefile b/libX11/makefile index e393965e8..67e45be17 100644 --- a/libX11/makefile +++ b/libX11/makefile @@ -10,7 +10,6 @@ INCLUDELIBFILES = \ modules\lc\utf8\$(OBJDIR)\libxlcUTF8Load.lib \
modules\lc\def\$(OBJDIR)\libxlcDef.lib \
modules\lc\gen\$(OBJDIR)\liblcGenConvLoad.lib \
- modules\lc\xlocale\$(OBJDIR)\libxlocale.lib \
$(MHMAKECONF)\libXau\$(OBJDIR)\libXau.lib \
$(MHMAKECONF)\libxcb\src\$(OBJDIR)\libxcb.lib
|