Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/glsl/ast_function.cpp
	mesalib/src/glsl/glsl_types.cpp
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/main/texparam.c
	xorg-server/config/udev.c
	xorg-server/configure.ac
	xorg-server/dix/main.c
	xorg-server/hw/dmx/dmxinit.c
	xorg-server/hw/kdrive/src/kdrive.c
	xorg-server/hw/xfree86/common/xf86Config.c
	xorg-server/hw/xfree86/common/xf86Configure.c
	xorg-server/hw/xfree86/common/xf86Helper.c
	xorg-server/hw/xfree86/common/xf86Init.c
	xorg-server/hw/xfree86/common/xf86Option.c
	xorg-server/hw/xfree86/common/xf86Priv.h
	xorg-server/hw/xfree86/common/xf86Xinput.c
	xorg-server/hw/xnest/Init.c
	xorg-server/hw/xquartz/darwin.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/xlaunch/config.cc
	xorg-server/hw/xwin/xlaunch/config.h
	xorg-server/hw/xwin/xlaunch/main.cc
	xorg-server/hw/xwin/xlaunch/resources/dialog.rc
	xorg-server/hw/xwin/xlaunch/resources/resources.h
	xorg-server/hw/xwin/xlaunch/resources/resources.rc
	xorg-server/hw/xwin/xlaunch/resources/strings.rc
	xorg-server/hw/xwin/xlaunch/window/util.cc
	xorg-server/hw/xwin/xlaunch/window/util.h
	xorg-server/hw/xwin/xlaunch/window/wizard.h
	xorg-server/include/os.h
	xorg-server/os/log.c
	xorg-server/xkeyboard-config/symbols/lv

1 files changed, 7 insertions, 7 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/lv b/xorg-server/xkeyboard-config/symbols/lv
index 532c49749..34bb65aae 100644
--- a/xorg-server/xkeyboard-config/symbols/lv
+++ b/xorg-server/xkeyboard-config/symbols/lv
@@ -299,18 +299,18 @@ xkb_symbols "modern" {
 	key <AC08> {[ i,		I,		i,		I			]};

 	key <AC09> {[ t,		T,		t,		T			]};

 	key <AC10> {[ r,		R,		rcedilla,	Rcedilla		]};

-	key <AC11> {[ m,		M,		bar,		M			]};

-	key <AC12> {[ slash,		question,	backslash,	U263A			]};

+	key <AC11> {[ m,		M,		m,		M			]};

+	key <BKSL> {[ slash,		question,	backslash,	bar			]};

 

 	key <LSGT> {[ q,		Q,		q,		Q			]};

 	key <AB01> {[ x,		X,		q,		Q			]};

 	key <AB02> {[ z,		Z,		zcaron,		Zcaron			]};

 	key <AB03> {[ c,		C,		ccaron,		Ccaron			]};

-	key <AB04> {[ v,		V,		v,		V			]};

-	key <AB05> {[ w,		W,		w,		W			]};

-	key <AB06> {[ f,		F,		f,		F			]};

-	key <AB07> {[ y,		Y,		y,		Y			]};

-	key <AB08> {[ h,		H,		h,		H			]};

+	key <AB04> {[ v,		V,		period,		V			]};

+	key <AB05> {[ w,		W,		slash,		W			]};

+	key <AB06> {[ f,		F,		bar,		F			]};

+	key <AB07> {[ y,		Y,		backslash,	Y			]};

+	key <AB08> {[ h,		H,		U263A,		U2639			]};

 	key <AB09> {[ comma,		semicolon,	less,		multiply		]};

 	key <AB10> {[ period,		colon,		greater,	division		]};

 	key <SPCE> {[ space,		space,		apostrophe				]};