diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-20 09:35:03 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-20 09:35:03 +0200 |
| commit | 6dbcc9a627a91ad8ef03f5074a4fc3c726cdfd80 (patch) | |
| tree | b35ca00e86dfcff8ca05b8e4737cd10b7545c2fb /xorg-server/doc/dtrace | |
| parent | 9bea2bf9069195c27824644331d4a275ea3df9f4 (diff) | |
| parent | 4703c93aaecf0d5794eca723cd5b1b72b04d04ee (diff) | |
| download | vcxsrv-6dbcc9a627a91ad8ef03f5074a4fc3c726cdfd80.tar.gz vcxsrv-6dbcc9a627a91ad8ef03f5074a4fc3c726cdfd80.tar.bz2 vcxsrv-6dbcc9a627a91ad8ef03f5074a4fc3c726cdfd80.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/common.py
mesalib/scons/custom.py
mesalib/scons/gallium.py
mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
mesalib/src/mesa/main/fbobject.c
mesalib/src/mesa/main/teximage.c
mesalib/src/mesa/main/texobj.c
mesalib/src/mesa/state_tracker/st_format.c
xorg-server/configure.ac
xorg-server/exa/exa_unaccel.c
Diffstat (limited to 'xorg-server/doc/dtrace')
| -rw-r--r-- | xorg-server/doc/dtrace/Makefile.am | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/xorg-server/doc/dtrace/Makefile.am b/xorg-server/doc/dtrace/Makefile.am index aaf5a1267..df26d2b9e 100644 --- a/xorg-server/doc/dtrace/Makefile.am +++ b/xorg-server/doc/dtrace/Makefile.am @@ -1,6 +1,5 @@ if ENABLE_DOCS -if HAVE_XMLTO if XSERVER_DTRACE # Main DocBook/XML files (DOCTYPE book) @@ -13,5 +12,4 @@ shelfdir = $(docdir) include $(top_srcdir)/docbook.am endif XSERVER_DTRACE -endif HAVE_XMLTO endif ENABLE_DOCS |