vcxsrv/mesalib/src/glsl/glsl_parser_extras.h, 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-10T13:36:25+00:00
marha
marha@users.sourceforge.net
2011-05-10T13:36:25+00:00
urn:sha1:2e5094b5a8e6241621cbf8c3e41b618347de7e2f
libfontenc pixman mesa git update 10 May 2011
2011-05-10T13:17:13+00:00
marha
marha@users.sourceforge.net
2011-05-10T13:17:13+00:00
urn:sha1:0f6aea154580c2f220be98d12108dd7d316c21f6
svn merge ^/branches/released .
2011-05-03T15:37:14+00:00
marha
marha@users.sourceforge.net
2011-05-03T15:37:14+00:00
urn:sha1:e4bd55e182560fa87af77ee3ec49fc1a907ead85
xkeyboard libxcb pixman mesa git update 2 May 2011
2011-05-03T12:48:26+00:00
marha
marha@users.sourceforge.net
2011-05-03T12:48:26+00:00
urn:sha1:cc93496bdbb3e7aea51033ece75fa85cfb5845d4
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-02T10:53:27+00:00
marha
marha@users.sourceforge.net
2011-03-02T10:53:27+00:00
urn:sha1:43fb99508848b8e9f4ced9a7e7a6c3692047fbf1
pixman mesa git update 1 Mar 2011
2011-03-01T07:17:23+00:00
marha
marha@users.sourceforge.net
2011-03-01T07:17:23+00:00
urn:sha1:a18769801e521ccb5a409c377ac0a6a1141f5776