svn merge ^/branches/released .

3 files changed, 15 insertions, 21 deletions

diff --git a/mesalib/src/mesa/program/prog_print.c b/mesalib/src/mesa/program/prog_print.c
index c1383f882..248f4d730 100644
--- a/mesalib/src/mesa/program/prog_print.c
+++ b/mesalib/src/mesa/program/prog_print.c
@@ -647,6 +647,7 @@ _mesa_fprint_instruction_opt(FILE *f,
    case OPCODE_TXP:

    case OPCODE_TXL:

    case OPCODE_TXB:

+   case OPCODE_TXD:

       fprintf(f, "%s", _mesa_opcode_string(inst->Opcode));

       if (inst->SaturateMode == SATURATE_ZERO_ONE)

          fprintf(f, "_SAT");

@@ -654,6 +655,12 @@ _mesa_fprint_instruction_opt(FILE *f,
       fprint_dst_reg(f, &inst->DstReg, mode, prog);

       fprintf(f, ", ");

       fprint_src_reg(f, &inst->SrcReg[0], mode, prog);

+      if (inst->Opcode == OPCODE_TXD) {

+         fprintf(f, ", ");

+         fprint_src_reg(f, &inst->SrcReg[1], mode, prog);

+         fprintf(f, ", ");

+         fprint_src_reg(f, &inst->SrcReg[2], mode, prog);

+      }

       fprintf(f, ", texture[%d], ", inst->TexSrcUnit);

       switch (inst->TexSrcTarget) {

       case TEXTURE_1D_INDEX:   fprintf(f, "1D");    break;

diff --git a/xorg-server/hw/xquartz/applewmExt.h b/xorg-server/hw/xquartz/applewmExt.h
index aae5e9169..36a469322 100644
--- a/xorg-server/hw/xquartz/applewmExt.h
+++ b/xorg-server/hw/xquartz/applewmExt.h
@@ -34,20 +34,15 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "window.h"

 #include <Xplugin.h>

 

+#if XPLUGIN_VERSION < 4

+typedef xp_frame_attr int;

+typedef xp_frame_class int;

+typedef xp_frame_rect int;

+#endif

+

 typedef int (*DisableUpdateProc)(void);

 typedef int (*EnableUpdateProc)(void);

 typedef int (*SetWindowLevelProc)(WindowPtr pWin, int level);

-#if XPLUGIN_VERSION < 4

-typedef int (*FrameGetRectProc)(int type, int class, const BoxRec *outer,

-                                const BoxRec *inner, BoxRec *ret);

-typedef int (*FrameHitTestProc)(int class, int x, int y,

-                                const BoxRec *outer,

-                                const BoxRec *inner, int *ret);

-typedef int (*FrameDrawProc)(WindowPtr pWin, int class, unsigned int attr,

-                             const BoxRec *outer, const BoxRec *inner,

-                             unsigned int title_len,

-                             const unsigned char *title_bytes);

-#else

 typedef int (*FrameGetRectProc)(xp_frame_rect type, xp_frame_class class, const BoxRec *outer,

                                 const BoxRec *inner, BoxRec *ret);

 typedef int (*FrameHitTestProc)(xp_frame_class class, int x, int y,

@@ -57,7 +52,6 @@ typedef int (*FrameDrawProc)(WindowPtr pWin, xp_frame_class class, xp_frame_attr
                              const BoxRec *outer, const BoxRec *inner,

                              unsigned int title_len,

                              const unsigned char *title_bytes);

-#endif

 typedef int (*SendPSNProc)(uint32_t hi, uint32_t lo);

 typedef int (*AttachTransientProc)(WindowPtr pWinChild, WindowPtr pWinParent);

 

diff --git a/xorg-server/xkeyboard-config/symbols/lt b/xorg-server/xkeyboard-config/symbols/lt
index 17310f7eb..7ba257b43 100644
--- a/xorg-server/xkeyboard-config/symbols/lt
+++ b/xorg-server/xkeyboard-config/symbols/lt
@@ -162,16 +162,9 @@ xkb_symbols "ibm" {
 };

 

 // LEKP and LEKPa layouts 1.0

-// Copyright (c) 2007 Tautrimas Pajarskas

+// Copyright (C) 2007 Tautrimas Pajarskas

 // For more info visit http://lekp.info

-//

-// LEKP and LEKPa layouts are licensed under the Creative Commons

-// Attribution-Noncommercial-Share Alike 3.0 License.

-// To view a copy of this license, visit

-// http://creativecommons.org/licenses/by-nc-sa/3.0/ or send

-// a letter to Creative Commons, 171 Second Street, Suite 300,

-// San Francisco, California, 94105, USA.

-//

+// Made by Ernestas Lukoševičius

 // Minor cleanup by Rimas Kudelis, 2010

 

 partial alphanumeric_keys modifier_keys