vcxsrv/mesalib/src/glsl/ast_function.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-05-04T15:07:35+00:00
marha
marha@users.sourceforge.net
2011-05-04T15:07:35+00:00
urn:sha1:3aa6e4dde5745319ed3051bdb11d107b072282e3
libX11 mesa glproto git update 4 May 2011
2011-05-04T10:53:27+00:00
marha
marha@users.sourceforge.net
2011-05-04T10:53:27+00:00
urn:sha1:7194f10aa94e3dc9d34eaf8bfa0bdb6c8aa46a38
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
xkeyboard-config pixman xkbcompt mesa git update 12 Feb 2011
2011-02-12T15:47:35+00:00
marha
marha@users.sourceforge.net
2011-02-12T15:47:35+00:00
urn:sha1:026b85e62b3d8812afb5f04df29aeac28c52b331
libXext xserver libXau libX11 pixman mesa git update 3 Feb 2011
2011-02-03T09:44:39+00:00
marha
marha@users.sourceforge.net
2011-02-03T09:44:39+00:00
urn:sha1:83a4fe0dc71aafbef11477b284abe530d3877556
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
mesalib git update 22/1/2011
2011-01-22T13:05:58+00:00
marha
marha@users.sourceforge.net
2011-01-22T13:05:58+00:00
urn:sha1:b8ffa56f8bda74a402eae0c89aadfda7b7db507f