aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/Xext/shm.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-01-08 12:40:16 +0100
committermarha <marha@users.sourceforge.net>2013-01-08 12:40:16 +0100
commitc2ada0e240f7c721ed09c9570b5375833c47370c (patch)
treeedf46fc67b3b6af1a10b2e5e223712fdc6dc77ea /xorg-server/Xext/shm.c
parent066de3c6d46ca099caba474b8e7d132ec772bc65 (diff)
parent8a26872f0c9102cb357345eca24a4bf7401bbe70 (diff)
downloadvcxsrv-c2ada0e240f7c721ed09c9570b5375833c47370c.tar.gz
vcxsrv-c2ada0e240f7c721ed09c9570b5375833c47370c.tar.bz2
vcxsrv-c2ada0e240f7c721ed09c9570b5375833c47370c.zip
Merge remote-tracking branch 'origin/released'
* origin/released: fontconfig mesa git update 8 jan 2013 Conflicts: fontconfig/src/fccache.c
Diffstat (limited to 'xorg-server/Xext/shm.c')
0 files changed, 0 insertions, 0 deletions