diff options
| author | marha <marha@users.sourceforge.net> | 2014-09-21 18:14:18 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-09-21 18:14:18 +0200 |
| commit | 4e080e0165d18887e2a0fccd7f30cf20fd04b178 (patch) | |
| tree | dbefa5addb60abe7a5c52dbc1daea7d6e0c9d4d0 /xorg-server | |
| parent | e16399e57caac9e859a7d28921c73ef9839b571e (diff) | |
| parent | d0f70707dde032e662dbd5bc70df6ac915403abe (diff) | |
| download | vcxsrv-4e080e0165d18887e2a0fccd7f30cf20fd04b178.tar.gz vcxsrv-4e080e0165d18887e2a0fccd7f30cf20fd04b178.tar.bz2 vcxsrv-4e080e0165d18887e2a0fccd7f30cf20fd04b178.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libXfont/src/fontfile/fontfile.c
libXfont/src/util/utilbitmap.c
Diffstat (limited to 'xorg-server')
0 files changed, 0 insertions, 0 deletions