Merge remote-tracking branch 'origin/released'

* origin/released:
  libxtrans fontconfig glproto libX11 libxcb xcbproto mesa xserver pixman xkeyboard-config git update 22 Dec 2013

Conflicts:
	mesalib/include/GL/glext.h
	mesalib/src/mesa/drivers/dri/common/dri_util.c
	mesalib/src/mesa/drivers/dri/swrast/swrast.c
	xorg-server/damageext/damageext.c
	xorg-server/dix/dispatch.c
	xorg-server/glx/glxdriswrast.c
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_program.c
	xorg-server/glx/render2.c
	xorg-server/glx/render2swap.c
	xorg-server/hw/xwin/glx/gen_gl_wrappers.py
	xorg-server/hw/xwin/glx/glthunk.c
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/include/os.h
	xorg-server/present/present_request.c

1 files changed, 4 insertions, 4 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/ua b/xorg-server/xkeyboard-config/symbols/ua
index e286f4835..9aea09e05 100644
--- a/xorg-server/xkeyboard-config/symbols/ua
+++ b/xorg-server/xkeyboard-config/symbols/ua
@@ -8,7 +8,7 @@
 default  partial alphanumeric_keys
 xkb_symbols "unicode" {
     include "ua(winkeys)"
- 
+
     name[Group1]= "Ukrainian";
 
     key <TLDE> {    [           U2019, 	apostrophe,    U0301,   asciitilde     ]       };	// Apostrophe and Stress symbol
@@ -43,7 +43,7 @@ xkb_symbols "unicode" {
     include "level3(ralt_switch)"
 };
 
-partial alphanumeric_keys 
+partial alphanumeric_keys
 xkb_symbols "legacy" {
 
     name[Group1]= "Ukrainian (legacy)";
@@ -105,7 +105,7 @@ xkb_symbols "legacy" {
 partial alphanumeric_keys
 xkb_symbols "winkeys" {
     include "ua(legacy)"
- 
+
     name[Group1]= "Ukrainian (WinKeys)";
 
     key <AE03> {        [               3,      numerosign      ]       };
@@ -149,7 +149,7 @@ xkb_symbols "typewriter" {
 partial alphanumeric_keys
 xkb_symbols "phonetic" {
   include "ua(legacy)"
-  
+
   name[Group1]= "Ukrainian (phonetic)";
 
   key <LatQ> {   [ Cyrillic_ya,       Cyrillic_YA         ]    };