diff options
author | marha <marha@users.sourceforge.net> | 2013-11-18 09:29:58 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-11-18 09:29:58 +0100 |
commit | 72ba71645132923bb8e0b93f7683aef8bc485aa2 (patch) | |
tree | baeaeff7e7ce5bf65f056625b435b8d55d4a04fa /xorg-server/xkeyboard-config/Makefile.am | |
parent | 4d64875593956234795d9947ac1d225e5b110f0f (diff) | |
parent | 7c20de6c7fb53ed404d4df0d975328318810ce01 (diff) | |
download | vcxsrv-72ba71645132923bb8e0b93f7683aef8bc485aa2.tar.gz vcxsrv-72ba71645132923bb8e0b93f7683aef8bc485aa2.tar.bz2 vcxsrv-72ba71645132923bb8e0b93f7683aef8bc485aa2.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
libXext mesa xkeyboard-config pixman 18 nov 2013
Conflicts:
libXext/src/eat.h
Diffstat (limited to 'xorg-server/xkeyboard-config/Makefile.am')
0 files changed, 0 insertions, 0 deletions