diff options
author | marha <marha@users.sourceforge.net> | 2011-01-21 12:52:35 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-01-21 12:52:35 +0000 |
commit | 7719409ebcf17c5288114dee8f60cc9ff889fd3e (patch) | |
tree | e86379743c048712c638bed954264fccea7798c4 /xorg-server/hw/xfree86 | |
parent | 26ee05a8febfe1ed6da852777a8c1c2a37e4cf9b (diff) | |
parent | b0be6a88c8fecdf15176f642c0799bff99930e0d (diff) | |
download | vcxsrv-7719409ebcf17c5288114dee8f60cc9ff889fd3e.tar.gz vcxsrv-7719409ebcf17c5288114dee8f60cc9ff889fd3e.tar.bz2 vcxsrv-7719409ebcf17c5288114dee8f60cc9ff889fd3e.zip |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86')
-rw-r--r-- | xorg-server/hw/xfree86/doc/man/Makefile.am | 2 | ||||
-rw-r--r-- | xorg-server/hw/xfree86/doc/man/xorg.conf.d.man | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/doc/man/Makefile.am b/xorg-server/hw/xfree86/doc/man/Makefile.am index fe330a72c..80e22cbab 100644 --- a/xorg-server/hw/xfree86/doc/man/Makefile.am +++ b/xorg-server/hw/xfree86/doc/man/Makefile.am @@ -1,3 +1,3 @@ include $(top_srcdir)/manpages.am appman_PRE = Xorg.man -fileman_PRE = xorg.conf.man +fileman_PRE = xorg.conf.man xorg.conf.d.man diff --git a/xorg-server/hw/xfree86/doc/man/xorg.conf.d.man b/xorg-server/hw/xfree86/doc/man/xorg.conf.d.man new file mode 100644 index 000000000..6b3379ece --- /dev/null +++ b/xorg-server/hw/xfree86/doc/man/xorg.conf.d.man @@ -0,0 +1 @@ +.so man__filemansuffix__/xorg.conf.__filemansuffix__ |