aboutsummaryrefslogtreecommitdiff
path: root/fontconfig/src/fcdir.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-10 10:26:07 +0200
committermarha <marha@users.sourceforge.net>2011-06-10 10:26:07 +0200
commit01b6bb489cc42ea112ed91dd1f2aeb90bc8e212b (patch)
tree1861405ebb9a51951bf16fd1d81ea95c61b6039f /fontconfig/src/fcdir.c
parent4cf8ef726ac1678d54aafde0375fc531f065ebb2 (diff)
parentee6b5ca3b101697d067675efa68f0e603cd61ffa (diff)
downloadvcxsrv-01b6bb489cc42ea112ed91dd1f2aeb90bc8e212b.tar.gz
vcxsrv-01b6bb489cc42ea112ed91dd1f2aeb90bc8e212b.tar.bz2
vcxsrv-01b6bb489cc42ea112ed91dd1f2aeb90bc8e212b.zip
Merge remote-tracking branch 'origin/released'
Conflicts: xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/rules/Makefile.am
Diffstat (limited to 'fontconfig/src/fcdir.c')
0 files changed, 0 insertions, 0 deletions