aboutsummaryrefslogtreecommitdiff
path: root/fontconfig/src
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-10-18 11:59:15 +0200
committermarha <marha@users.sourceforge.net>2013-10-18 11:59:15 +0200
commitb821fe861f33d7e8a39fe4c7d885b7ff379dc476 (patch)
tree7b3c0b22d35eadf598cff3965413a96c76d5ad39 /fontconfig/src
parent56e12b1310b1b52d00bc27e919d915255af5bf03 (diff)
parentb8a77c943fa53005b6cdb1ab792acf5ff0a131be (diff)
downloadvcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.tar.gz
vcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.tar.bz2
vcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.zip
Merge remote-tracking branch 'origin/released'
* origin/released: mesa pixman git update 18 okt 2013 Conflicts: mesalib/include/GL/glext.h mesalib/include/GL/glxext.h
Diffstat (limited to 'fontconfig/src')
0 files changed, 0 insertions, 0 deletions