aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/include/version-config.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-15 09:03:52 +0100
committermarha <marha@users.sourceforge.net>2013-11-15 09:03:52 +0100
commit4d64875593956234795d9947ac1d225e5b110f0f (patch)
tree5cc58965cdfe27a50f86f0d8872a7da80cc7248d /xorg-server/include/version-config.h
parent9837797b353b2e24e7ac96d3a74159497410c21a (diff)
parentaa095d69b3874eb179cb77f033109a7f8f351041 (diff)
downloadvcxsrv-4d64875593956234795d9947ac1d225e5b110f0f.tar.gz
vcxsrv-4d64875593956234795d9947ac1d225e5b110f0f.tar.bz2
vcxsrv-4d64875593956234795d9947ac1d225e5b110f0f.zip
Merge remote-tracking branch 'origin/released'
* origin/released: xcb-proto mesa xserver git update 15 nov 2013 Conflicts: xorg-server/mi/mieq.c
Diffstat (limited to 'xorg-server/include/version-config.h')
0 files changed, 0 insertions, 0 deletions