aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-12 11:22:24 +0100
committermarha <marha@users.sourceforge.net>2013-11-12 11:22:24 +0100
commitf1b679a372274041aa3e7a02f979390b17eb1ab5 (patch)
treef5bad38b25c1e5bf69cb06b4236cccb4310f769f /xorg-server
parent3ef320ddf5d23b4e69cc7d44a17f902e245f6426 (diff)
parentb73c544c61712f7bd57f3c9a0f6046481f58038b (diff)
downloadvcxsrv-f1b679a372274041aa3e7a02f979390b17eb1ab5.tar.gz
vcxsrv-f1b679a372274041aa3e7a02f979390b17eb1ab5.tar.bz2
vcxsrv-f1b679a372274041aa3e7a02f979390b17eb1ab5.zip
Merge remote-tracking branch 'origin/released'
* origin/released: pixman mesa fontconfig git update 12 nov 2013 Conflicts: mesalib/src/mesa/drivers/dri/swrast/swrast.c
Diffstat (limited to 'xorg-server')
0 files changed, 0 insertions, 0 deletions