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, 3 insertions, 3 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/by b/xorg-server/xkeyboard-config/symbols/by
index 00ecd6a8d..d82bcf57e 100644
--- a/xorg-server/xkeyboard-config/symbols/by
+++ b/xorg-server/xkeyboard-config/symbols/by
@@ -19,7 +19,7 @@ partial alphanumeric_keys
 xkb_symbols "legacy" {
 	include "by(basic)"
 	name[Group1]= "Belarusian (legacy)";
-	
+
 	key <AE03> {        [               3,      numbersign      ]       };
 	key <AE04> {        [               4,        asterisk      ]       };
 	key <AE05> {        [               5,           colon      ]       };
@@ -36,7 +36,7 @@ partial alphanumeric_keys
 xkb_symbols "latin" {
 	include "latin"
 	name[Group1]= "Belarusian (Latin)";
-	
+
 	key <AD02> {        [    w,    W,    scaron,    Scaron    ]       };
 	key <AD07> {        [    u,    U,    ubreve,    Ubreve    ]       };
 	key <AC02> {        [    s,    S,    sacute,    Sacute    ]       };
@@ -46,6 +46,6 @@ xkb_symbols "latin" {
 	key <AB03> {        [    c,    C,    cacute,    Cacute    ]       };
 	key <AB04> {        [    v,    V,    ccaron,    Ccaron    ]       };
 	key <AB06> {        [    n,    N,    nacute,    Nacute    ]       };
-	
+
 	include "level3(ralt_switch)"
 };