diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-25 09:24:55 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-25 09:24:55 +0200 |
| commit | af62a89a4e677bc0a10094be86816b2e273b2c4a (patch) | |
| tree | 3cceb0e23b7ab79dbcedb27c5546cf2666c1c7a0 /apps | |
| parent | de54c5b749b3eefb75d420840c889533a58aa342 (diff) | |
| parent | acf3535c75d7c79154b6b89c66567317944d244c (diff) | |
| download | vcxsrv-af62a89a4e677bc0a10094be86816b2e273b2c4a.tar.gz vcxsrv-af62a89a4e677bc0a10094be86816b2e273b2c4a.tar.bz2 vcxsrv-af62a89a4e677bc0a10094be86816b2e273b2c4a.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa git update 25 Jul 2013
Conflicts:
xorg-server/hw/xwin/win.h
xorg-server/hw/xwin/winclipboardthread.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winmouse.c
xorg-server/hw/xwin/winmultiwindowclass.c
xorg-server/hw/xwin/winscrinit.c
xorg-server/hw/xwin/winwin32rootless.c
xorg-server/hw/xwin/winwin32rootlesswndproc.c
xorg-server/hw/xwin/winwindow.h
xorg-server/hw/xwin/winwindowswm.c
xorg-server/hw/xwin/winwndproc.c
Diffstat (limited to 'apps')
0 files changed, 0 insertions, 0 deletions