diff options
| author | marha <marha@users.sourceforge.net> | 2014-04-14 23:49:11 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-04-14 23:49:11 +0200 |
| commit | 3053928d3e9e12e59c46917113bad496487f1d28 (patch) | |
| tree | 591c17cafc365399cc88774bba985af7276d957e /xorg-server/hw/xwayland/xwayland-cvt.c | |
| parent | 7c21629fbeb51b65fd0625bb36d888587d62fd89 (diff) | |
| parent | a3fe3e22d85e8aa795df85c21814fc84cac42e99 (diff) | |
| download | vcxsrv-3053928d3e9e12e59c46917113bad496487f1d28.tar.gz vcxsrv-3053928d3e9e12e59c46917113bad496487f1d28.tar.bz2 vcxsrv-3053928d3e9e12e59c46917113bad496487f1d28.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
tools/plink/misc.h
tools/plink/ssh.c
tools/plink/sshbn.c
tools/plink/winplink.c
Diffstat (limited to 'xorg-server/hw/xwayland/xwayland-cvt.c')
0 files changed, 0 insertions, 0 deletions