vcxsrv/fontconfig/fc-blanks/makefile, branch bugfix/bug3
VcXsrv Windows X Server (X2Go/Arctica Builds)
https://cgit.arctica-project.org/vcxsrv/atom?h=bugfix%2Fbug3
2015-03-05T22:42:09+00:00
Merge remote-tracking branch 'origin/released'
2015-03-05T22:42:09+00:00
marha
marha@users.sourceforge.net
2015-03-05T22:40:39+00:00
urn:sha1:c646056120fe14e4c4ccf81bac5d78d61225a8e8
Conflicts:
mesalib/src/mesa/drivers/dri/swrast/swrast.c
mesalib/src/mesa/main/.gitignore
mesalib/src/mesa/main/queryobj.c