diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-24 08:15:59 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-24 08:15:59 +0200 |
| commit | 285b1bd8933288fc56259cfb3de61207c8e35d9e (patch) | |
| tree | 2107aaa7f683f16a9a1a73e5f6f2d7ba53710f32 /xorg-server/xkeyboard-config/geometry/makefile | |
| parent | c665b6e88274f8bc603b0f14f92bf09d2023bd4d (diff) | |
| parent | 4eb0b643ad978d94837e2d587a5d4358f974a25c (diff) | |
| download | vcxsrv-285b1bd8933288fc56259cfb3de61207c8e35d9e.tar.gz vcxsrv-285b1bd8933288fc56259cfb3de61207c8e35d9e.tar.bz2 vcxsrv-285b1bd8933288fc56259cfb3de61207c8e35d9e.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa xserver git update 24 oct 2013
Conflicts:
xorg-server/glx/glxdricommon.c
Diffstat (limited to 'xorg-server/xkeyboard-config/geometry/makefile')
0 files changed, 0 insertions, 0 deletions