diff options
author | marha <marha@users.sourceforge.net> | 2012-10-01 12:04:07 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-10-01 12:04:07 +0200 |
commit | 7305d42f2ad0462ca3916a73df49cc6b70b41fe4 (patch) | |
tree | 4de7ec9601f83c61d84e9b8cda40ca0f5ca6bc91 /xorg-server/xkeyboard-config/keycodes/sgi_vndr/indy | |
parent | c86fbbd2c3bb30e96a614456bbb7688e0387cf8c (diff) | |
parent | 7ed9dbafdbc724c1030404f29678559134de559b (diff) | |
download | vcxsrv-7305d42f2ad0462ca3916a73df49cc6b70b41fe4.tar.gz vcxsrv-7305d42f2ad0462ca3916a73df49cc6b70b41fe4.tar.bz2 vcxsrv-7305d42f2ad0462ca3916a73df49cc6b70b41fe4.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxcb mesa pixman xkeyboard-config git update 1 oct 2012
Conflicts:
libxcb/src/man/.gitignore
Diffstat (limited to 'xorg-server/xkeyboard-config/keycodes/sgi_vndr/indy')
0 files changed, 0 insertions, 0 deletions