Merge remote-tracking branch 'origin/released'

Conflicts:
	libX11/src/OpenDis.c
	libX11/src/xcb_io.c
	xorg-server/xkeyboard-config/keymap/sun_vndr/all.in
	xorg-server/xkeyboard-config/semantics/default.in

1 files changed, 0 insertions, 9 deletions

diff --git a/xorg-server/xkeyboard-config/compat/norepeat b/xorg-server/xkeyboard-config/compat/norepeat
deleted file mode 100644
index 1f47d7e17..000000000
--- a/xorg-server/xkeyboard-config/compat/norepeat
+++ /dev/null
@@ -1,9 +0,0 @@
-// Put any otherwise normal keys that you don't want to repeat in

-// this file

-

-default partial xkb_compatibility "norepeat"  {

-    interpret Return {

-	action= NoAction();

-	repeat= False;

-    };

-};