aboutsummaryrefslogtreecommitdiff
path: root/libX11/modules/om/generic
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-06-11 15:12:35 +0000
committermarha <marha@users.sourceforge.net>2010-06-11 15:12:35 +0000
commitbb9571d3ede4adbb9396fdb25ab8e3e91aba1479 (patch)
tree8e21e43376a5b106a5d9689a4349385101263325 /libX11/modules/om/generic
parentd1e4f4b8546c7955c66dd023bfd6ef437db9d21d (diff)
parentf56cfbb54588917d9566277a669fa086a842b2f5 (diff)
downloadvcxsrv-bb9571d3ede4adbb9396fdb25ab8e3e91aba1479.tar.gz
vcxsrv-bb9571d3ede4adbb9396fdb25ab8e3e91aba1479.tar.bz2
vcxsrv-bb9571d3ede4adbb9396fdb25ab8e3e91aba1479.zip
svn merge ^/branches/released .
Diffstat (limited to 'libX11/modules/om/generic')
-rw-r--r--libX11/modules/om/generic/Makefile.am1
1 files changed, 0 insertions, 1 deletions
diff --git a/libX11/modules/om/generic/Makefile.am b/libX11/modules/om/generic/Makefile.am
index 9076edb48..435a0aa66 100644
--- a/libX11/modules/om/generic/Makefile.am
+++ b/libX11/modules/om/generic/Makefile.am
@@ -12,7 +12,6 @@ AM_CPPFLAGS= \
AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
- $(XDMCP_CFLAGS) \
$(MALLOC_ZERO_CFLAGS) \
$(CWARNFLAGS)