aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/symbols
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-14 08:14:45 +0200
committermarha <marha@users.sourceforge.net>2011-06-14 08:14:45 +0200
commit6b441c10eeb02569204ff50ba8c3b739037b8141 (patch)
treef9c0dd95a41268546aeecdd31c8588c617749cd1 /xorg-server/xkeyboard-config/symbols
parent0d495843cebea4ae94a3138db2bf51da80a16391 (diff)
parent4d74e36f359d22b50302c82a922b79ac24dd3e23 (diff)
downloadvcxsrv-6b441c10eeb02569204ff50ba8c3b739037b8141.tar.gz
vcxsrv-6b441c10eeb02569204ff50ba8c3b739037b8141.tar.bz2
vcxsrv-6b441c10eeb02569204ff50ba8c3b739037b8141.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/src/mesa/SConscript mesalib/src/mesa/drivers/common/driverfuncs.c mesalib/src/mesa/main/texgetimage.c mesalib/src/mesa/sources.mak mesalib/src/mesa/swrast/s_texrender.c mesalib/src/mesa/vbo/vbo_exec_array.c xorg-server/xkeyboard-config/configure.in
Diffstat (limited to 'xorg-server/xkeyboard-config/symbols')
0 files changed, 0 insertions, 0 deletions