diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-08 13:12:15 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-08 13:12:15 +0100 |
| commit | f707ea3ce065f0ce40f586c40283fab42059b485 (patch) | |
| tree | 055a5ccdecaec105365d1de9a90d7d6b38f257fb /xorg-server/dix | |
| parent | c8483dc2831dc37d93a36804022f6b064f5962ea (diff) | |
| parent | 09e94a8e392e8fe6fd89ddefbf3897a92e525b5b (diff) | |
| download | vcxsrv-f707ea3ce065f0ce40f586c40283fab42059b485.tar.gz vcxsrv-f707ea3ce065f0ce40f586c40283fab42059b485.tar.bz2 vcxsrv-f707ea3ce065f0ce40f586c40283fab42059b485.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Added presentproto-1.0
libxtrans libxcb xcb-proto mesa git update 8 nov 2013
Conflicts:
X11/xtrans/Xtransint.h
X11/xtrans/Xtranssock.c
libxcb/src/.gitignore
mesalib/src/mesa/drivers/dri/common/dri_util.c
Diffstat (limited to 'xorg-server/dix')
| -rw-r--r--[-rwxr-xr-x] | xorg-server/dix/dispatch.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | xorg-server/dix/privates.c | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/xorg-server/dix/dispatch.c b/xorg-server/dix/dispatch.c index b2ca29f10..b2ca29f10 100755..100644 --- a/xorg-server/dix/dispatch.c +++ b/xorg-server/dix/dispatch.c diff --git a/xorg-server/dix/privates.c b/xorg-server/dix/privates.c index f9b45d816..f9b45d816 100755..100644 --- a/xorg-server/dix/privates.c +++ b/xorg-server/dix/privates.c |