Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/glsl/builtin_functions.cpp

1 files changed, 64 insertions, 0 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/al b/xorg-server/xkeyboard-config/symbols/al
index a8d6ec715..a6d58bfb7 100644
--- a/xorg-server/xkeyboard-config/symbols/al
+++ b/xorg-server/xkeyboard-config/symbols/al
@@ -39,3 +39,67 @@ xkb_symbols "basic" {
 
     include "level3(ralt_switch)"
 };
+
+
+partial alphanumeric_keys 
+xkb_symbols "plisi-d1" {
+
+  include "us"
+
+  name[Group1]= "Albanian (Plisi D1)";
+
+  key <TLDE> { [ grave, asciitilde ] };
+  key <AE01> { [ 1, exclam ] };
+  key <AE02> { [ 2, at ] };
+  key <AE03> { [ 3, numbersign ] };
+  key <AE04> { [ 4, dollar, EuroSign ] };
+  key <AE05> { [ 5, percent ] };
+  key <AE06> { [ 6, asciicircum ] };
+  key <AE07> { [ 7, ampersand, braceleft ] };
+  key <AE08> { [ 8, asterisk, braceright ] };
+  key <AE09> { [ 9, parenleft, bracketleft ] };
+  key <AE10> { [ 0, parenright, bracketright ] };
+  key <AE11> { [ minus, underscore ] };
+  key <AE12> { [ equal, plus ] };
+
+  key <AD01> { [ q, Q ] };
+  key <AD02> { [ w, W ] };
+  key <AD03> { [ e, E ] };
+  key <AD04> { [ r, R ] };
+  key <AD05> { [ t, T ] };
+  key <AD06> { [ y, Y ] };
+  key <AD07> { [ u, U ] };
+  key <AD08> { [ i, I ] };
+  key <AD09> { [ o, O ] };
+  key <AD10> { [ p, P ] };
+  key <AD11> { [ ccedilla, Ccedilla ] };
+  key <AD12> { [ greater, less ] };
+
+  key <AC01> { [ a, A ] };
+  key <AC02> { [ s, S ] };
+  key <AC03> { [ d, D ] };
+  key <AC04> { [ f, F ] };
+  key <AC05> { [ g, G ] };
+  key <AC06> { [ h, H ] };
+  key <AC07> { [ j, J ] };
+  key <AC08> { [ k, K ] };
+  key <AC09> { [ l, L ] };
+  key <AC10> { [ ediaeresis, Ediaeresis ] };
+  key <AC11> { [ apostrophe, quotedbl ] };
+
+  key <AB01> { [ z, Z ] };
+  key <AB02> { [ x, X ] };
+  key <AB03> { [ c, C ] };
+  key <AB04> { [ v, V ] };
+  key <AB05> { [ b, B ] };
+  key <AB06> { [ n, N ] };
+  key <AB07> { [ m, M ] };
+  key <AB08> { [ comma, semicolon ] };
+  key <AB09> { [ period, colon ] };
+  key <AB10> { [ slash, question ] };
+
+  key <BKSL> { [ backslash, bar ] };
+
+  include "level3(ralt_switch)"
+};
+