vcxsrv/mesalib/include, 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-06-27T06:58:51+00:00
Merge remote-tracking branch 'origin/released'
2011-06-27T06:58:51+00:00
marha
marha@users.sourceforge.net
2011-06-27T06:58:51+00:00
urn:sha1:83cb62fe8002927ba95861a4fd21cc44c48bfcf7
Conflicts:
apps/xwininfo/configure.ac
apps/xwininfo/xwininfo.c
fontconfig/src/fcmatch.c
mesalib/include/GL/internal/dri_interface.h
mesalib/src/glsl/main.cpp
mesalib/src/mesa/main/pack.c
mesalib/src/mesa/main/renderbuffer.c
mesalib/src/mesa/main/renderbuffer.h
mesalib/src/mesa/main/teximage.c
mesalib/src/mesa/state_tracker/st_cb_texture.c
mesalib/src/mesa/state_tracker/st_draw.c
mesalib/src/mesa/state_tracker/st_format.c
pixman/configure.ac
pixman/pixman/pixman-arm-neon-asm.S
pixman/test/blitters-test.c
xwininfo fontconfig mesa pixman git update 27 June 2011
2011-06-27T06:55:46+00:00
marha
marha@users.sourceforge.net
2011-06-27T06:55:46+00:00
urn:sha1:0feab87a4300a3e204e259d14a0a63e58e4a3c8f
Merge remote-tracking branch 'origin/released'
2011-06-09T07:27:21+00:00
marha
marha@users.sourceforge.net
2011-06-09T07:27:21+00:00
urn:sha1:0de14292c4fac98f91105baf9cc16e58f25d4d77
Conflicts:
mesalib/include/GL/internal/dri_interface.h
mesalib/src/gallium/auxiliary/util/u_math.h
mesalib/src/mapi/glapi/gen/Makefile
mesalib/src/mapi/glapi/gen/gl_table.py
mesalib/src/mesa/SConscript
mesalib/src/mesa/main/dlist.c
mesalib/src/mesa/main/es_generator.py
mesalib/src/mesa/main/imports.h
mesalib/src/mesa/main/teximage.c
mesalib/src/mesa/main/uniforms.c
mesalib/src/mesa/state_tracker/st_draw.c
mesalib/src/mesa/state_tracker/st_program.c
mesalib/src/mesa/vbo/vbo_save_api.c
xorg-server/xkeyboard-config/configure.in
xorg-server/xkeyboard-config/rules/Makefile.am
xorg-server/xkeyboard-config/rules/base.xml.in
xorg-server/xkeyboard-config/symbols/cz
xorg-server/xkeyboard-config/symbols/in
mesa xkbcomp xkeyboard-config git update 9 Jun 2011
2011-06-09T07:24:20+00:00
marha
marha@users.sourceforge.net
2011-06-09T07:24:20+00:00
urn:sha1:0a9d2abef2e6fac5d52556969655a62711df6418
Merge remote-tracking branch 'origin/released'
2011-05-30T09:09:12+00:00
marha
marha@users.sourceforge.net
2011-05-30T09:09:12+00:00
urn:sha1:87d1238786c12499ac27e9daef4d157e7250d2cb
Synchronised files. The revision number was removed
2011-05-30T09:04:26+00:00
marha
marha@users.sourceforge.net
2011-05-30T09:04:26+00:00
urn:sha1:b53c5364a7161e8310d62b90d5b5ca4635535892
xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 May 2011
2011-05-22T13:28:34+00:00
marha
marha@users.sourceforge.net
2011-05-22T13:28:34+00:00
urn:sha1:52011cfedaa930d61d8f60b283a2051093727582
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