diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-05 15:55:59 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-05 15:55:59 +0200 |
| commit | 046f1422921cf63104f394a430634d364a8fd35a (patch) | |
| tree | 5d49eef25d6c128ea369383e8de2a0e5a5dcf1c3 /xorg-server/os | |
| parent | f2c10b20ce3f657c1f2013057602bb439816940f (diff) | |
| parent | 50fad5cd2be4cd105c99687e224da60233f81645 (diff) | |
| download | vcxsrv-046f1422921cf63104f394a430634d364a8fd35a.tar.gz vcxsrv-046f1422921cf63104f394a430634d364a8fd35a.tar.bz2 vcxsrv-046f1422921cf63104f394a430634d364a8fd35a.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
Diffstat (limited to 'xorg-server/os')
0 files changed, 0 insertions, 0 deletions