Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/glsl/builtin_functions.cpp

1 files changed, 10 insertions, 0 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/de b/xorg-server/xkeyboard-config/symbols/sun_vndr/de
index 7736088bb..d95b07952 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/de
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/de
@@ -121,6 +121,16 @@ partial alphanumeric_keys
 };
 
 partial alphanumeric_keys
+	xkb_symbols "adnw" {
+	include "de(adnw)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "adnw_base" {
+	include "de(adnw_base)"
+};
+
+partial alphanumeric_keys
 	xkb_symbols "neo" {
 	include "de(neo)"
 };