vcxsrv/mesalib/src/glsl/ir.cpp, branch 1.10.3.0
VcXsrv Windows X Server (X2Go/Arctica Builds)
https://cgit.arctica-project.org/vcxsrv/atom?h=1.10.3.0
2011-07-01T14:49:54+00:00
Merge remote-tracking branch 'origin/released'
2011-07-01T14:49:54+00:00
marha
marha@users.sourceforge.net
2011-07-01T14:49:54+00:00
urn:sha1:3bbcbc59b6d98f09b26f39d6208faec76cc6aa3e
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
xwininfo libX11 mesa mkfontscale xserver xkeyboard-config git update 1 Juli
2011-07-01T12:21:21+00:00
marha
marha@users.sourceforge.net
2011-07-01T12:21:21+00:00
urn:sha1:d9f970a847e1af706f07560ef163b229bb592307
2011
svn merge ^/branches/released .
2011-03-17T14:17:54+00:00
marha
marha@users.sourceforge.net
2011-03-17T14:17:54+00:00
urn:sha1:76b655664dad149451d0abaa15929d1b7b62e0c6
xserver libX11 mesa git updaet 17 Mar 2011
2011-03-17T13:49:22+00:00
marha
marha@users.sourceforge.net
2011-03-17T13:49:22+00:00
urn:sha1:d7f1bd4112420f1d4b41c5409074eca6b34bf507
xserver libX11 libxcb mesa git update 15 Mar 2011
2011-03-15T21:35:41+00:00
marha
marha@users.sourceforge.net
2011-03-15T21:35:41+00:00
urn:sha1:5e633abcca598289d0423d89bb400b41e6417259
libX11 libXinerama mesa git update 1 Feb 2011
2011-02-01T10:02:38+00:00
marha
marha@users.sourceforge.net
2011-02-01T10:02:38+00:00
urn:sha1:0bf07d32cbd460220c67d726900772cf3692746d
pixman and mesalib git update 27 jan 2011
2011-01-27T11:07:33+00:00
marha
marha@users.sourceforge.net
2011-01-27T11:07:33+00:00
urn:sha1:dc9d750132f95783d2db6fb8e08271fc0878576d
mesalib pixman xkbcomp git update 13 jan 2011
2011-01-13T22:01:27+00:00
marha
marha@users.sourceforge.net
2011-01-13T22:01:27+00:00
urn:sha1:a0a46bd55d7cbbf70757a29c067e21b70ac4e2df
xkeyboard-config libX11 mesalib git update 12 jan 2011
2011-01-12T20:34:04+00:00
marha
marha@users.sourceforge.net
2011-01-12T20:34:04+00:00
urn:sha1:2ebdcfeee38bed8c65daa78aa7d18d8d1d93ed85
xserver and mesa git update 28-12-2010
2010-12-28T16:10:20+00:00
marha
marha@users.sourceforge.net
2010-12-28T16:10:20+00:00
urn:sha1:807c6931fe683fd844ceec1b023232181e6aae03