vcxsrv/mesalib/src/glsl/linker.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-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-07-07T06:37:48+00:00
marha
marha@users.sourceforge.net
2011-07-07T06:37:48+00:00
urn:sha1:dbe01a4f78f09723b327d1d8522bfa5026c4f6e0
Conflicts:
mesalib/src/glsl/ir_print_visitor.cpp
mesalib/src/glsl/linker.cpp
mesalib/src/glsl/opt_constant_propagation.cpp
mesalib/src/mesa/program/ir_to_mesa.cpp
mesa xkbcomp git update 7 Juli 2011
2011-07-07T06:34:33+00:00
marha
marha@users.sourceforge.net
2011-07-07T06:34:33+00:00
urn:sha1:47a6ae678489d7082b5d7da35d1a92b4233fb5eb
Merge remote-tracking branch 'origin/released'
2011-06-21T12:43:05+00:00
marha
marha@users.sourceforge.net
2011-06-21T12:43:05+00:00
urn:sha1:6bf5e6441da930ba3c1541f4e5e61ef7e6866b35
Conflicts:
fontconfig/doc/fcformat.fncs
fontconfig/fc-cat/fc-cat.c
fontconfig/fc-list/fc-list.c
fontconfig/fc-match/fc-match.c
fontconfig/src/fcdir.c
fontconfig/src/fcformat.c
fontconfig/src/fcname.c
mesalib/src/glsl/linker.cpp
mesalib/src/mesa/state_tracker/st_format.c
fontconfig mesa git update 21 June 2011
2011-06-21T12:40:39+00:00
marha
marha@users.sourceforge.net
2011-06-21T12:40:39+00:00
urn:sha1:8a49ff701cfa50f9dcb237051e2ba7ac0302a515
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
svn merge ^/branches/released .
2011-03-30T07:22:44+00:00
marha
marha@users.sourceforge.net
2011-03-30T07:22:44+00:00
urn:sha1:4e1588b6805ee5c7cd34e733cd1eff098d063b95
mesa git update 30 Mar 2011
2011-03-30T06:43:04+00:00
marha
marha@users.sourceforge.net
2011-03-30T06:43:04+00:00
urn:sha1:2039567395da75a3ae318fb82738cdcf2caa05a1