vcxsrv/fontconfig/src, branch 1.11.3.0
VcXsrv Windows X Server (X2Go/Arctica Builds)
https://cgit.arctica-project.org/vcxsrv/atom?h=1.11.3.0
2011-09-26T15:08:48+00:00
Merge remote-tracking branch 'origin/released'
2011-09-26T15:08:48+00:00
marha
marha@users.sourceforge.net
2011-09-26T15:08:48+00:00
urn:sha1:95acf9816e008fa46a6c2fa2f35500deb358bb69
Conflicts:
libXmu/src/CmapAlloc.c
fontconfig libX11 libXext libXft libXmu mesa git update 26 sep 2011
2011-09-26T15:04:30+00:00
marha
marha@users.sourceforge.net
2011-09-26T15:04:30+00:00
urn:sha1:873965b49f283ad028dd4e0e5b7e93a758c84993
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-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-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
Added gitignore files
2011-05-30T12:12:12+00:00
marha
marha@users.sourceforge.net
2011-05-30T12:12:12+00:00
urn:sha1:91def498916935bc9ebd433a28981d19bf426961
svn merge ^/branches/released .
2011-03-29T07:22:59+00:00
marha
marha@users.sourceforge.net
2011-03-29T07:22:59+00:00
urn:sha1:2ed8e0e263e27934ba97c00d4820dab5ec08b548
xserver fontconfig mesa git update 29 Mar 2011
2011-03-29T06:44:20+00:00
marha
marha@users.sourceforge.net
2011-03-29T06:44:20+00:00
urn:sha1:24abc56b37a3ec32a03b7eafccd96607ae13ea89