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 /libX11/src/util | |
| 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 'libX11/src/util')
| -rw-r--r-- | libX11/src/util/.gitignore | 4 | ||||
| -rw-r--r-- | libX11/src/util/mkks.sh | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/libX11/src/util/.gitignore b/libX11/src/util/.gitignore index e744d636d..5f95924b5 100644 --- a/libX11/src/util/.gitignore +++ b/libX11/src/util/.gitignore @@ -1,2 +1,2 @@ -# Add & Override for this directory and it's subdirectories
-makekeys
+# Add & Override for this directory and it's subdirectories +makekeys diff --git a/libX11/src/util/mkks.sh b/libX11/src/util/mkks.sh index 3e80c354b..262cc9540 100644 --- a/libX11/src/util/mkks.sh +++ b/libX11/src/util/mkks.sh @@ -1,11 +1,11 @@ -#!/bin/sh
-
-cat $* | awk 'BEGIN { \
- printf "/*\n * This file is generated from %s. Do not edit.\n */\n", \
- "$(INCLUDESRC)/keysymdef.h";\
-} \
-/^#define/ { \
- len = length($2)-3; \
- printf("{ \"%s\", %s },\n", substr($2,4,len), $3); \
-}'
-
+#!/bin/sh + +cat $* | awk 'BEGIN { \ + printf "/*\n * This file is generated from %s. Do not edit.\n */\n", \ + "$(INCLUDESRC)/keysymdef.h";\ +} \ +/^#define/ { \ + len = length($2)-3; \ + printf("{ \"%s\", %s },\n", substr($2,4,len), $3); \ +}' + |