Merge remote-tracking branch 'origin/released'

Conflicts:
	libX11/specs/i18n/trans/trans.xml
	mesalib/src/glsl/glsl_parser_extras.cpp
	mesalib/src/glsl/ir_print_visitor.cpp
	xorg-server/xkeyboard-config/rules/base.xml.in
	xorg-server/xkeyboard-config/rules/xkb.dtd
	xorg-server/xkeyboard-config/symbols/de

2 files changed, 2 insertions, 2 deletions

diff --git a/mesalib/src/glsl/glsl_parser_extras.cpp b/mesalib/src/glsl/glsl_parser_extras.cpp
index 8de806d4d..809e6d174 100644
--- a/mesalib/src/glsl/glsl_parser_extras.cpp
+++ b/mesalib/src/glsl/glsl_parser_extras.cpp
@@ -436,7 +436,7 @@ ast_expression::print(void) const
       printf("? ");

       subexpressions[1]->print();

       printf(": ");

-      subexpressions[1]->print();

+      subexpressions[2]->print();

       break;

 

    case ast_array_index:

diff --git a/mesalib/src/glsl/ir_print_visitor.cpp b/mesalib/src/glsl/ir_print_visitor.cpp
index ba95103ea..cabb2f6cc 100644
--- a/mesalib/src/glsl/ir_print_visitor.cpp
+++ b/mesalib/src/glsl/ir_print_visitor.cpp
@@ -370,7 +370,7 @@ void ir_print_visitor::visit(ir_constant *ir)
    } else if (ir->type->is_record()) {

       ir_constant *value = (ir_constant *) ir->components.get_head();

       for (unsigned i = 0; i < ir->type->length; i++) {

-	 printf("(%s ", ir->type->fields.structure->name);

+	 printf("(%s ", ir->type->fields.structure[i].name);

 	 value->accept(this);

 	 printf(")");