diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-06 13:39:40 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-06 13:39:40 +0200 |
| commit | d53900c52abc2402f978b72278712e4bcdbde9f2 (patch) | |
| tree | 689cedc44df148a96d68ef460cff6b1756f096b6 /xorg-server/glx/xfont.c | |
| parent | 36eb733ed5aaaeaefc49c8894bf213d16b58d242 (diff) | |
| parent | 2414a1de3cc17f438219f8f2a58b530d33e99a5e (diff) | |
| download | vcxsrv-d53900c52abc2402f978b72278712e4bcdbde9f2.tar.gz vcxsrv-d53900c52abc2402f978b72278712e4bcdbde9f2.tar.bz2 vcxsrv-d53900c52abc2402f978b72278712e4bcdbde9f2.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa pixman xserver xkeyboard-config
Conflicts:
xorg-server/dix/dispatch.c
Diffstat (limited to 'xorg-server/glx/xfont.c')
0 files changed, 0 insertions, 0 deletions