vcxsrv/mesalib/src/glsl/glcpp, branch 1.11.4.0
VcXsrv Windows X Server (X2Go/Arctica Builds)
https://cgit.arctica-project.org/vcxsrv/atom?h=1.11.4.0
2011-11-25T07:32:21+00:00
Merge remote-tracking branch 'origin/released'
2011-11-25T07:32:21+00:00
marha
marha@users.sourceforge.net
2011-11-25T07:32:21+00:00
urn:sha1:849d328b25c2f3c87d539e1fe7af38e7580a0409
Conflicts:
xorg-server/glx/glxdriswrast.c
xorg-server/glx/single2.c
xorg-server/hw/xwin/winconfig.c
xorg-server/os/osinit.c
xorg-server/os/xdmcp.c
xorg-server/xkb/xkbInit.c
mesa xserver pixman git update 25 nov 2011
2011-11-25T07:22:48+00:00
marha
marha@users.sourceforge.net
2011-11-25T07:22:48+00:00
urn:sha1:a0b4a1330be6a36ad095222d2ea83927cd33514d
Merge remote-tracking branch 'origin/released'
2011-11-14T08:42:43+00:00
marha
marha@users.sourceforge.net
2011-11-14T08:42:43+00:00
urn:sha1:93795f7d8ca73dd428a926901cbc632015ac0cf5
Conflicts:
libX11/src/util/makekeys.c
libX11 libXext libXinerama libXmu libfontenc libxcb mesa pixman git update
2011-11-14T08:38:56+00:00
marha
marha@users.sourceforge.net
2011-11-14T08:38:56+00:00
urn:sha1:156e37d3879b316329e3e05579414031da2647e2
14 nov 2011
Merge remote-tracking branch 'origin/released'
2011-11-04T08:28:39+00:00
marha
marha@users.sourceforge.net
2011-11-04T08:28:39+00:00
urn:sha1:23e2767dc3e6b8891d4b55b711c70c6bc85a6f85
Conflicts:
mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h
xorg-server/hw/xwin/InitOutput.c
xorg-server/hw/xwin/ddraw.h
xorg-server/hw/xwin/winclipboardwndproc.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winmonitors.c
xorg-server/hw/xwin/winprocarg.c
xorg-server/hw/xwin/winwin32rootlesswndproc.c
xorg-server/include/scrnintstr.h
xorg-server/xkb/ddxList.c
xorg-server/xkb/ddxLoad.c
xserver pixman mesa git update 4 nov 2011
2011-11-04T07:57:20+00:00
marha
marha@users.sourceforge.net
2011-11-04T07:57:20+00:00
urn:sha1:02f377d5e2dd18537d0807ad63675a0970b5a37d
Merge remote-tracking branch 'origin/released'
2011-10-05T15:44:57+00:00
marha
marha@users.sourceforge.net
2011-10-05T15:44:57+00:00
urn:sha1:8af87a5b60e37ae84fdd759e2c1602be38be4905
Conflicts:
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mesa/main/syncobj.h
xorg-server/dix/events.c
xorg-server/dix/getevents.c
xorg-server/include/misc.h
mkfontscale pixman xserver xtrans libX11 libXdmcp libxcb libXmu mesa git update 5 oct 2011
2011-10-05T15:37:34+00:00
marha
marha@users.sourceforge.net
2011-10-05T15:37:34+00:00
urn:sha1:f7025b4baa1ba35ee796785641f04eac5bedb0a6
Synchronised line endinge with release branch
2011-09-12T09:27:51+00:00
marha
marha@users.sourceforge.net
2011-09-12T09:27:51+00:00
urn:sha1:dafebc5bb70303f0b5baf0b087cf4d9a64b5c7f0
Merge remote-tracking branch 'origin/released'
2011-09-12T07:07:21+00:00
marha
marha@users.sourceforge.net
2011-09-12T07:07:21+00:00
urn:sha1:0b40f5f4b54453a77f4b09c431f8efc6875da61f
Conflicts:
mesalib/src/glsl/ast_to_hir.cpp
mesalib/src/glsl/glcpp/glcpp.c
mesalib/src/mesa/drivers/dri/common/dri_util.c
mesalib/src/mesa/drivers/dri/common/spantmp2.h
mesalib/src/mesa/drivers/dri/common/utils.c
mesalib/src/mesa/drivers/dri/swrast/swrast.c
mesalib/src/mesa/program/ir_to_mesa.cpp
mesalib/src/mesa/state_tracker/st_extensions.c
mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
pixman/configure.ac
pixman/pixman/pixman-arm-neon-asm.S
pixman/test/Makefile.am
pixman/test/utils.c
pixman/test/utils.h