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

5 files changed, 0 insertions, 33 deletions

diff --git a/xorg-server/xkeyboard-config/semantics/Makefile.am b/xorg-server/xkeyboard-config/semantics/Makefile.am
deleted file mode 100644
index 9e92daaca..000000000
--- a/xorg-server/xkeyboard-config/semantics/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-semanticsdir = $(xkb_base)/semantics
-
-dist_semantics_DATA = \
-basic complete default \
-xtest
-
-dir_data = $(dist_semantics_DATA)
-
-include $(top_srcdir)/xkbrules.am
diff --git a/xorg-server/xkeyboard-config/semantics/basic b/xorg-server/xkeyboard-config/semantics/basic
deleted file mode 100644
index 71575a3a3..000000000
--- a/xorg-server/xkeyboard-config/semantics/basic
+++ /dev/null
@@ -1,6 +0,0 @@
-default xkb_semantics "basic" {

-

-xkb_types		{ include "basic" 	};

-xkb_compatibility	{ include "basic"	};

-

-};

diff --git a/xorg-server/xkeyboard-config/semantics/complete b/xorg-server/xkeyboard-config/semantics/complete
deleted file mode 100644
index 08152e563..000000000
--- a/xorg-server/xkeyboard-config/semantics/complete
+++ /dev/null
@@ -1,6 +0,0 @@
-default xkb_semantics "complete" {

-

-xkb_types		{ include "complete" 	};

-xkb_compatibility	{ include "complete"	};

-

-};

diff --git a/xorg-server/xkeyboard-config/semantics/default.in b/xorg-server/xkeyboard-config/semantics/default.in
deleted file mode 100644
index a6e70c991..000000000
--- a/xorg-server/xkeyboard-config/semantics/default.in
+++ /dev/null
@@ -1,6 +0,0 @@
-default xkb_semantics "default" {
-
-xkb_types		{ include "default" 	};
-xkb_compatibility	{ include "default"	};
-
-};
diff --git a/xorg-server/xkeyboard-config/semantics/xtest b/xorg-server/xkeyboard-config/semantics/xtest
deleted file mode 100644
index 64a35459b..000000000
--- a/xorg-server/xkeyboard-config/semantics/xtest
+++ /dev/null
@@ -1,6 +0,0 @@
-default xkb_semantics "xtest" {

-

-xkb_types		{ include "basic" 	};

-xkb_compatibility	{ include "xtest"	};

-

-};