diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-19 10:38:33 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-19 10:38:33 +0100 |
| commit | 24635abae6008bef13e30d798b3f33abab412770 (patch) | |
| tree | e799fbde24e0fd935af76b0bc48d30ef69f75d54 /xorg-server/xkeyboard-config/rules/compat/.gitignore | |
| parent | e0844ae8b5ef87049537a7e0ebff81acc2695256 (diff) | |
| parent | 6ce1d8f0f8c23e186175a7c84c21d7bfbe168dc5 (diff) | |
| download | vcxsrv-24635abae6008bef13e30d798b3f33abab412770.tar.gz vcxsrv-24635abae6008bef13e30d798b3f33abab412770.tar.bz2 vcxsrv-24635abae6008bef13e30d798b3f33abab412770.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Changed file permissions
dos -> unix
Conflicts:
libX11/include/X11/Xregion.h
libX11/src/ConvSel.c
libX11/src/CrGlCur.c
libX11/src/CrWindow.c
libX11/src/GetDflt.c
libX11/src/StrKeysym.c
libX11/src/Window.c
libX11/src/xkb/XKBBind.c
libX11/src/xkb/XKBGetMap.c
libX11/src/xkb/XKBSetGeom.c
libX11/src/xkb/XKBUse.c
libX11/src/xlibi18n/XimProto.h
libX11/src/xlibi18n/lcDynamic.c
libXdmcp/Key.c
libXdmcp/Write.c
libxcb/src/xcb_windefs.h
xkbcomp/keycodes.c
xkbcomp/xkbpath.c
xorg-server/hw/xwin/glx/winpriv.h
xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
xorg-server/xkeyboard-config/rules/bin/ml_s.sh
xorg-server/xkeyboard-config/rules/bin/mln_s.sh
xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh
xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
xorg-server/xkeyboard-config/rules/compat/.gitignore
Diffstat (limited to 'xorg-server/xkeyboard-config/rules/compat/.gitignore')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/compat/.gitignore | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/xorg-server/xkeyboard-config/rules/compat/.gitignore b/xorg-server/xkeyboard-config/rules/compat/.gitignore index 24ecdb6ba..077356fbb 100644 --- a/xorg-server/xkeyboard-config/rules/compat/.gitignore +++ b/xorg-server/xkeyboard-config/rules/compat/.gitignore @@ -1,16 +1,16 @@ -base.ml1_s.part
-base.ml1v1_s.part
-base.ml2_s.part
-base.ml2v2_s.part
-base.ml3_s.part
-base.ml3v3_s.part
-base.ml4_s.part
-base.ml4v4_s.part
-base.ml_s.part
-base.mlv_s.part
-ml1_s.bat
-ml1v1_s.bat
-ml_s.bat
-mln_s.bat
-mlnvn_s.bat
+base.ml1_s.part +base.ml1v1_s.part +base.ml2_s.part +base.ml2v2_s.part +base.ml3_s.part +base.ml3v3_s.part +base.ml4_s.part +base.ml4v4_s.part +base.ml_s.part +base.mlv_s.part +ml1_s.bat +ml1v1_s.bat +ml_s.bat +mln_s.bat +mlnvn_s.bat mlv_s.bat
\ No newline at end of file |