Merge remote-tracking branch 'origin/released'

Conflicts:
	apps/xwininfo/configure.ac
	libX11/configure.ac
	mesalib/src/glsl/ast_function.cpp
	mesalib/src/glsl/ast_to_hir.cpp
	mesalib/src/glsl/glsl_parser_extras.cpp
	mesalib/src/glsl/glsl_parser_extras.h
	mesalib/src/glsl/ir.cpp
	mesalib/src/glsl/ir.h
	mesalib/src/glsl/ir_constant_expression.cpp
	mesalib/src/glsl/ir_validate.cpp
	mesalib/src/glsl/lower_mat_op_to_vec.cpp
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
	mesalib/src/mesa/state_tracker/st_cb_texture.c
	mesalib/src/mesa/state_tracker/st_context.h
	mesalib/src/mesa/state_tracker/st_format.h
	mkfontscale/configure.ac
	xorg-server/Xext/xvmc.c
	xorg-server/configure.ac
	xorg-server/dix/Makefile.am
	xorg-server/fb/fbarc.c
	xorg-server/fb/fbgc.c
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glxdri2.c
	xorg-server/glx/glxscreens.c
	xorg-server/hw/xfree86/Makefile.am
	xorg-server/hw/xfree86/loader/Makefile.am
	xorg-server/hw/xquartz/X11Application.m
	xorg-server/hw/xquartz/mach-startup/Makefile.am
	xorg-server/hw/xwin/XWin.rc
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/os/Makefile.am
	xorg-server/test/Makefile.am
	xorg-server/xfixes/region.c
	xorg-server/xkeyboard-config/symbols/ma

2 files changed, 5 insertions, 6 deletions

diff --git a/xorg-server/hw/dmx/config/xdmxconfig.c b/xorg-server/hw/dmx/config/xdmxconfig.c
index c67077aec..2de7f2b85 100644
--- a/xorg-server/hw/dmx/config/xdmxconfig.c
+++ b/xorg-server/hw/dmx/config/xdmxconfig.c
@@ -877,8 +877,8 @@ int main(int argc, char **argv)
     Widget         parent, menubox, bottombox, databox, canvasbox;
     Widget         filebutton, helpbutton;
     Widget         filemenu, openbutton, savebutton, quitbutton;
-    Widget         helpmenu, aboutbutton, aboutbox, abouttext, aboutok;
-    Widget         quitbox, quittext, quitok, quitcan;
+    Widget         helpmenu, aboutbutton, aboutbox, aboutok;
+    Widget         quitbox, quitok, quitcan;
     Widget         ncbutton;
     Widget         canbutton;
     Widget         ecbox, ecokbutton, eccanbutton;
@@ -1096,7 +1096,7 @@ int main(int argc, char **argv)
                                         toplevel, NULL);
     aboutbox     = XtVaCreateManagedWidget("aboutbox", boxWidgetClass,
                                            aboutpopup, NULL);
-    abouttext    = XtVaCreateManagedWidget("abouttext", labelWidgetClass,
+                   XtVaCreateManagedWidget("abouttext", labelWidgetClass,
                                            aboutbox,
                                            XtNlabel, DMX_INFO,
                                            NULL);
@@ -1108,7 +1108,7 @@ int main(int argc, char **argv)
                                         toplevel, NULL);
     quitbox      = XtVaCreateManagedWidget("quitbox", boxWidgetClass,
                                            quitpopup, NULL);
-    quittext     = XtVaCreateManagedWidget("quittext", labelWidgetClass,
+                   XtVaCreateManagedWidget("quittext", labelWidgetClass,
                                            quitbox,
                                            XtNlabel,
                                            "Changes to the configuration\n"
diff --git a/xorg-server/hw/dmx/examples/xbell.c b/xorg-server/hw/dmx/examples/xbell.c
index f3e3be1b8..79419d324 100644
--- a/xorg-server/hw/dmx/examples/xbell.c
+++ b/xorg-server/hw/dmx/examples/xbell.c
@@ -71,7 +71,6 @@ int main(int argc, char **argv)
     XKeyboardControl kc;
     XKeyboardState   ks;
     unsigned long    vm;
-    int              percent;
 
     if (argc != 5) {
         printf("Usage: xbell percent baseVolume pitch duration\n");
@@ -81,7 +80,7 @@ int main(int argc, char **argv)
     vm               = (KBBellPercent
                         | KBBellPitch
                         | KBBellDuration);
-    percent          = atoi(argv[1]);
+    kc.key_click_percent = atoi(argv[1]);
     kc.bell_percent  = atoi(argv[2]);
     kc.bell_pitch    = atoi(argv[3]);
     kc.bell_duration = atoi(argv[4]);