SwallowOS/xserver_xsdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-api

Browse Source 
Conflicts:
	dix/getevents.c
	hw/xfree86/common/xf86Xinput.h

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer
2010-11-11 12:54:46 +10:00
parent 19f43836d1 4ed4915bc0
commit 88cb61e1e5
122 changed files with 846 additions and 2523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/xml/dtrace/Makefile.am
View File

@@ -25,11 +25,13 @@ XML_FILES = Xserver-DTrace.xml
include ../xmlrules.in
if ENABLE_DOCS
if XSERVER_DTRACE
doc_DATA = $(BUILT_DOC_FILES)
else
noinst_DATA = $(BUILT_DOC_FILES)
endif
endif
CLEANFILES = $(CLEAN_DOC_FILES)