diff options
| author | marha <marha@users.sourceforge.net> | 2011-02-21 07:34:07 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-02-21 07:34:07 +0000 |
| commit | c7ba12a119f88d0d16cf5810297f0aa789f93f4f (patch) | |
| tree | 06cbb490bbee07a1d7add84c9e3f3f9bead01a86 /xorg-server/xkeyboard-config/rules/extras | |
| parent | 684eb992146cad24b690073f33b909f47150b841 (diff) | |
| parent | 248adea786d4a5a9d2c71679722eda734d4e7be7 (diff) | |
| download | vcxsrv-c7ba12a119f88d0d16cf5810297f0aa789f93f4f.tar.gz vcxsrv-c7ba12a119f88d0d16cf5810297f0aa789f93f4f.tar.bz2 vcxsrv-c7ba12a119f88d0d16cf5810297f0aa789f93f4f.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkeyboard-config/rules/extras')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/extras/Makefile.am | 3 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/extras/makefile | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/xorg-server/xkeyboard-config/rules/extras/Makefile.am b/xorg-server/xkeyboard-config/rules/extras/Makefile.am index 16119a3f0..0387a868c 100644 --- a/xorg-server/xkeyboard-config/rules/extras/Makefile.am +++ b/xorg-server/xkeyboard-config/rules/extras/Makefile.am @@ -12,8 +12,7 @@ base.ml4v4_s.part \ base.ml_s.part \
base.ml1_s.part \
base.mlv_s.part \
-base.ml1v1_s.part \
-base.ml_s.part
+base.ml1v1_s.part
noinst_SCRIPTS=$(scripts)
diff --git a/xorg-server/xkeyboard-config/rules/extras/makefile b/xorg-server/xkeyboard-config/rules/extras/makefile index 2712ec269..5c837dbf1 100644 --- a/xorg-server/xkeyboard-config/rules/extras/makefile +++ b/xorg-server/xkeyboard-config/rules/extras/makefile @@ -12,8 +12,7 @@ base.ml4v4_s.part \ base.ml_s.part \ base.ml1_s.part \ base.mlv_s.part \ -base.ml1v1_s.part \ -base.ml_s.part +base.ml1v1_s.part SH=cmd /c |