vcxsrv/mesalib/src/glsl/ast_to_hir.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-04-27T15:56:59+00:00
marha
marha@users.sourceforge.net
2011-04-27T15:56:59+00:00
urn:sha1:100633b3e7619842f345cb7603b0db6b5761dd11
xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011
2011-04-27T06:58:32+00:00
marha
marha@users.sourceforge.net
2011-04-27T06:58:32+00:00
urn:sha1:96d6df5da9cddedf4931bf8e17f96e242467c661
svn merge ^/branches/released .
2011-04-14T08:39:30+00:00
marha
marha@users.sourceforge.net
2011-04-14T08:39:30+00:00
urn:sha1:898081f31f99dc35a1602a607a07d1aaff49ac40
server xkeyboard-config mesa git update 14 Apr 2011
2011-04-14T06:41:54+00:00
marha
marha@users.sourceforge.net
2011-04-14T06:41:54+00:00
urn:sha1:019fc27ce6dc2a1809107be10d4deb80e0fa436b
svn merge ^/branches/released .
2011-03-28T12:59:46+00:00
marha
marha@users.sourceforge.net
2011-03-28T12:59:46+00:00
urn:sha1:3015123fd2904d907896b1aefbe32c267baa2dc2
xserver xkeyboard-config mesa git update 28 Mar 2011
2011-03-28T10:22:02+00:00
marha
marha@users.sourceforge.net
2011-03-28T10:22:02+00:00
urn:sha1:0b9b391c5a7acb31e5d8061169649043a38d6d0e
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