vcxsrv/mesalib/src/mesa/main/texobj.c, 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-11T07:02:33+00:00
Merge remote-tracking branch 'origin/released'
2011-07-11T07:02:33+00:00
marha
marha@users.sourceforge.net
2011-07-11T07:02:33+00:00
urn:sha1:4611d27b8966b26b8ac63514a461f31c3172c31c
Conflicts:
mesalib/docs/GL3.txt
mesalib/src/glsl/linker.cpp
mesalib/src/mesa/main/depthstencil.c
mesalib/src/mesa/main/fbobject.c
mesalib/src/mesa/main/formats.c
mesalib/src/mesa/main/formats.h
mesalib/src/mesa/main/framebuffer.c
mesalib/src/mesa/main/mtypes.h
mesalib/src/mesa/main/pack.c
mesalib/src/mesa/main/readpix.c
mesalib/src/mesa/main/renderbuffer.c
mesalib/src/mesa/main/samplerobj.c
mesalib/src/mesa/main/shaderapi.c
mesalib/src/mesa/main/texenv.c
mesalib/src/mesa/main/texobj.c
mesalib/src/mesa/main/uniforms.c
mesalib/src/mesa/state_tracker/st_cb_clear.c
mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
mesalib/src/mesa/state_tracker/st_cb_readpixels.c
mesalib/src/mesa/state_tracker/st_extensions.c
mesalib/src/mesa/state_tracker/st_format.c
mesalib/src/mesa/swrast/s_readpix.c
mesa update 11 july 2011
2011-07-11T06:47:29+00:00
marha
marha@users.sourceforge.net
2011-07-11T06:47:29+00:00
urn:sha1:0b43e0b4ddbd9fdac70658164f3dbf653067a4de
Merge remote-tracking branch 'origin/released'
2011-06-20T07:35:03+00:00
marha
marha@users.sourceforge.net
2011-06-20T07:35:03+00:00
urn:sha1:6dbcc9a627a91ad8ef03f5074a4fc3c726cdfd80
Conflicts:
mesalib/common.py
mesalib/scons/custom.py
mesalib/scons/gallium.py
mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
mesalib/src/mesa/main/fbobject.c
mesalib/src/mesa/main/teximage.c
mesalib/src/mesa/main/texobj.c
mesalib/src/mesa/state_tracker/st_format.c
xorg-server/configure.ac
xorg-server/exa/exa_unaccel.c
libX11 xserver mesa git update 20 June 2011
2011-06-20T07:33:04+00:00
marha
marha@users.sourceforge.net
2011-06-20T07:33:04+00:00
urn:sha1:4703c93aaecf0d5794eca723cd5b1b72b04d04ee
merge ^/branches/released .
2011-05-13T11:23:57+00:00
marha
marha@users.sourceforge.net
2011-05-13T11:23:57+00:00
urn:sha1:421ecdd3ee6f691c63c4568944423d986f9f69db
mesa git update 13 May 2011
2011-05-13T11:18:23+00:00
marha
marha@users.sourceforge.net
2011-05-13T11:18:23+00:00
urn:sha1:d8c3e3d2ba88d6b87a718aef7f4fb4627113eb52
svn merge ^/branches/released .
2011-05-09T10:10:32+00:00
marha
marha@users.sourceforge.net
2011-05-09T10:10:32+00:00
urn:sha1:5bb5135182a1a50b1b6659d8aa5168ebfbe71979
libXext libX11 mkfontscale mesa git update 9 May 2011
2011-05-09T09:35:45+00:00
marha
marha@users.sourceforge.net
2011-05-09T09:35:45+00:00
urn:sha1:43b2398ee28e9144fd51eb9994d67c4c9a198c9c
svn merge ^/branches/released .
2011-04-12T13:48:18+00:00
marha
marha@users.sourceforge.net
2011-04-12T13:48:18+00:00
urn:sha1:e2c8d047679db3bbb166d709b86e18180be6d713
mesa libXext pixman git update 12 Apr 2011
2011-04-12T12:47:58+00:00
marha
marha@users.sourceforge.net
2011-04-12T12:47:58+00:00
urn:sha1:7730393619080086530e24d3b594351b4114f608