diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-07 08:28:39 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-08-07 08:28:39 +0200 |
| commit | 666141b21e89c617ca466af62ebcb56dc4f5450c (patch) | |
| tree | 4d0cddde47b6d8cbc92395dc2091849f89d68138 /apps | |
| parent | e158f8fc4a9cf2f884d156ff2dfc0870facfbcba (diff) | |
| parent | f8e35ebbe71eed74ccf68af8ccda4182f1edc7f0 (diff) | |
| download | vcxsrv-666141b21e89c617ca466af62ebcb56dc4f5450c.tar.gz vcxsrv-666141b21e89c617ca466af62ebcb56dc4f5450c.tar.bz2 vcxsrv-666141b21e89c617ca466af62ebcb56dc4f5450c.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/hw/xwin/glx/indirect.c
xorg-server/hw/xwin/winclipboardwndproc.c
xorg-server/hw/xwin/winmultiwindowicons.c
xorg-server/hw/xwin/winmultiwindowwindow.c
xorg-server/hw/xwin/winmultiwindowwm.c
xorg-server/hw/xwin/winwin32rootlesswindow.c
xorg-server/hw/xwin/winwindow.h
Diffstat (limited to 'apps')
0 files changed, 0 insertions, 0 deletions