Merge remote-tracking branch 'origin/released'

* origin/released:
  fontconfig libfontenc mesa mkfontscale pixman xserver xkeyboard-config

Conflicts:
	mesalib/src/mesa/main/syncobj.c
	mesalib/src/mesa/main/syncobj.h
	xorg-server/hw/xwin/winconfig.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c

2 files changed, 1 insertions, 32 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/ad b/xorg-server/xkeyboard-config/symbols/ad
deleted file mode 100644
index 0b1520175..000000000
--- a/xorg-server/xkeyboard-config/symbols/ad
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-// Catalan Keyboard, as manufactured by Large Format Computing, Inc.
-//
-// For layout graphic, see http://www.language-keyboard.com/languages/catalan_layout.htm
-//
-// Contributed by Robert Millan
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-    include "us"
-
-    name[Group1]="Catalan";
-
-    key <AE02> { [ 2, at, dead_diaeresis ] };
-    key <AE07> { [ 7, ampersand, dead_acute ] };
-    key <AE09> { [ 9, parenleft, dead_grave ] };
-    key <AD02> { [ w, W, eacute, Eacute ] };
-    key <AD03> { [ e, E, egrave, Egrave ] };
-    key <AD06> { [ y, Y, udiaeresis, Udiaeresis ] };
-    key <AD07> { [ u, U, uacute, Uacute	] };
-    key <AD08> { [ i, I, iacute, Iacute	] };
-    key <AD09> { [ o, O, oacute, Oacute	] };
-    key <AD10> { [ p, P, ograve, Ograve	] };
-    key <AD12> { [ bracketright, braceright, EuroSign ] };
-    key <AC01> { [ a, A, agrave, Agrave ] };
-    key <AC08> { [ k, K, idiaeresis, Idiaeresis ] };
-    key <AC09> { [ l, L, periodcentered ] };
-    key <AB03> { [ c, C, ccedilla, Ccedilla ] };
-
-    include "level3(ralt_switch)"
-};
diff --git a/xorg-server/xkeyboard-config/symbols/am b/xorg-server/xkeyboard-config/symbols/am
index 5e6954e0b..abe6e1270 100644
--- a/xorg-server/xkeyboard-config/symbols/am
+++ b/xorg-server/xkeyboard-config/symbols/am
@@ -12,7 +12,7 @@ xkb_symbols "basic" {
 
     key <AE01> {	[ 0x1000586,  0x1000556	]	};
     key <AE02> {	[ 0x1000571,  0x1000541	]	};
-    key <AE03> {	[ 0x1002013,  0x1002014 ]	};
+    key <AE03> {	[ 0x100058a,  0x1002014 ]	};
     key <AE04> {	[     comma,  dollar	]	};
     key <AE05> {	[ 0x1000589,  0x1002026	] 	};
     key <AE06> {	[ 0x100055e,  percent	]	};