diff options
author | marha <marha@users.sourceforge.net> | 2012-11-07 08:02:14 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-11-07 08:02:14 +0100 |
commit | 2c345c9da4dedfafe791557ca3fcf891ce26249d (patch) | |
tree | 18dc73394bd3921415b57b5847f03a9753374e99 /xorg-server/hw/xfree86/int10/xf86int10.c | |
parent | 7c531937cfab42f2fd3233c096c409ebdd5b59af (diff) | |
parent | 1cc98f5a48924d750fbef7ea6b05a1ba49c28589 (diff) | |
download | vcxsrv-2c345c9da4dedfafe791557ca3fcf891ce26249d.tar.gz vcxsrv-2c345c9da4dedfafe791557ca3fcf891ce26249d.tar.bz2 vcxsrv-2c345c9da4dedfafe791557ca3fcf891ce26249d.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa xkbcomp git update 5 nov 2012
Conflicts:
mesalib/src/glsl/.gitignore
mesalib/src/mesa/main/.gitignore
xorg-server/Xi/chgdctl.c
xorg-server/dix/getevents.c
xorg-server/hw/xwin/winprefs.c
xorg-server/os/utils.c
Diffstat (limited to 'xorg-server/hw/xfree86/int10/xf86int10.c')
0 files changed, 0 insertions, 0 deletions