vcxsrv/xorg-server/glx, 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
Synchronised files with mesa
2011-06-21T12:49:49+00:00
marha
marha@users.sourceforge.net
2011-06-21T12:49:49+00:00
urn:sha1:e980a639952c7b2732b53c63e64335f14c319381
Syncrhonised file with mesa
2011-06-16T06:30:55+00:00
marha
marha@users.sourceforge.net
2011-06-16T06:30:55+00:00
urn:sha1:aa5db0c31378f6dee271da6cf24f7e4da55fe9ef
Merge remote-tracking branch 'origin/released'
2011-06-16T06:20:46+00:00
marha
marha@users.sourceforge.net
2011-06-16T06:20:46+00:00
urn:sha1:35d058b84797ad0b71722195146a948a277dff25
Conflicts:
xorg-server/glx/glapi.h
xorg-server/hw/xquartz/GL/indirect.c
xorg-server/hw/xquartz/X11Application.m
xorg-server/xkeyboard-config/symbols/jp
xserver xkeyboard-config xkbcomp git update 16 June 2011
2011-06-16T06:06:24+00:00
marha
marha@users.sourceforge.net
2011-06-16T06:06:24+00:00
urn:sha1:26686c98bac306ee4e6502850e2dc8afbe4a496a
Synchronised files
2011-06-09T07:32:52+00:00
marha
marha@users.sourceforge.net
2011-06-09T07:32:52+00:00
urn:sha1:4cf8ef726ac1678d54aafde0375fc531f065ebb2
Synchronised files with mesa
2011-06-03T06:54:32+00:00
marha
marha@users.sourceforge.net
2011-06-03T06:54:32+00:00
urn:sha1:03fa24f76277662240d0af8770e168fc38b533cb
merge ^/branches/released .
2011-05-24T06:33:14+00:00
marha
marha@users.sourceforge.net
2011-05-24T06:33:14+00:00
urn:sha1:941e7f505285f0b77f232f700561c752ce75ff97
svn merge ^/branches/released .
2011-05-22T14:29:51+00:00
marha
marha@users.sourceforge.net
2011-05-22T14:29:51+00:00
urn:sha1:016747a04df9d4474489fe3b3d1c0f11a713148b