diff options
author | marha <marha@users.sourceforge.net> | 2013-11-15 09:03:52 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-11-15 09:03:52 +0100 |
commit | 4d64875593956234795d9947ac1d225e5b110f0f (patch) | |
tree | 5cc58965cdfe27a50f86f0d8872a7da80cc7248d /libxcb/xcb-proto/src/.gitattributes | |
parent | 9837797b353b2e24e7ac96d3a74159497410c21a (diff) | |
parent | aa095d69b3874eb179cb77f033109a7f8f351041 (diff) | |
download | vcxsrv-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 'libxcb/xcb-proto/src/.gitattributes')
-rw-r--r-- | libxcb/xcb-proto/src/.gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libxcb/xcb-proto/src/.gitattributes b/libxcb/xcb-proto/src/.gitattributes new file mode 100644 index 000000000..8d345b069 --- /dev/null +++ b/libxcb/xcb-proto/src/.gitattributes @@ -0,0 +1 @@ +*.xml diff=xcb |