diff options
| author | marha <marha@users.sourceforge.net> | 2014-11-29 12:44:10 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-11-29 12:44:10 +0100 |
| commit | 0dbe845b2f4ba08924d6fcb9634d09dc3dde13d6 (patch) | |
| tree | 4fc0c706447f18bc522bb503273ec9e10f6c2ba5 /xorg-server/hw/xfree86/vgahw | |
| parent | d17578910169acabae7e67a3da8f26b5ed608ce6 (diff) | |
| parent | d6d5581d5fba846c8476ad4d593da662306765d7 (diff) | |
| download | vcxsrv-0dbe845b2f4ba08924d6fcb9634d09dc3dde13d6.tar.gz vcxsrv-0dbe845b2f4ba08924d6fcb9634d09dc3dde13d6.tar.bz2 vcxsrv-0dbe845b2f4ba08924d6fcb9634d09dc3dde13d6.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/hw/xwin/winclip.c
xorg-server/hw/xwin/winengine.c
xorg-server/hw/xwin/winfont.c
xorg-server/hw/xwin/wingc.c
xorg-server/hw/xwin/wingetsp.c
xorg-server/hw/xwin/winmisc.c
xorg-server/hw/xwin/winnativegdi.c
xorg-server/hw/xwin/winpfbdd.c
xorg-server/hw/xwin/winpixmap.c
xorg-server/hw/xwin/winpolyline.c
xorg-server/hw/xwin/winscrinit.c
xorg-server/hw/xwin/winsetsp.c
xorg-server/hw/xwin/winwindow.c
Diffstat (limited to 'xorg-server/hw/xfree86/vgahw')
0 files changed, 0 insertions, 0 deletions