diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-10 10:26:07 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-10 10:26:07 +0200 |
| commit | 01b6bb489cc42ea112ed91dd1f2aeb90bc8e212b (patch) | |
| tree | 1861405ebb9a51951bf16fd1d81ea95c61b6039f /xorg-server/xkeyboard-config/rules | |
| parent | 4cf8ef726ac1678d54aafde0375fc531f065ebb2 (diff) | |
| parent | ee6b5ca3b101697d067675efa68f0e603cd61ffa (diff) | |
| download | vcxsrv-01b6bb489cc42ea112ed91dd1f2aeb90bc8e212b.tar.gz vcxsrv-01b6bb489cc42ea112ed91dd1f2aeb90bc8e212b.tar.bz2 vcxsrv-01b6bb489cc42ea112ed91dd1f2aeb90bc8e212b.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/xkeyboard-config/configure.in
xorg-server/xkeyboard-config/rules/Makefile.am
Diffstat (limited to 'xorg-server/xkeyboard-config/rules')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/Makefile.am | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/xorg-server/xkeyboard-config/rules/Makefile.am b/xorg-server/xkeyboard-config/rules/Makefile.am index e8b704cea..dcf9e3d90 100644 --- a/xorg-server/xkeyboard-config/rules/Makefile.am +++ b/xorg-server/xkeyboard-config/rules/Makefile.am @@ -234,11 +234,3 @@ rulesdir = $(xkb_base)/rules xmldir = $(rulesdir)
@INTLTOOL_XML_NOMERGE_RULE@
-
-xkeyboard-config.man: evdev.xml
- $(XSLTPROC) $(top_srcdir)/xslt/man.xsl evdev.xml > $@
-
-xkeyboard-config.7: xkeyboard-config.man
- $(SED) $(MAN_SUBSTS) < $< > $@
-
-dist_man_MANS = xkeyboard-config.7
|