diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-16 08:20:46 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-16 08:20:46 +0200 |
| commit | 35d058b84797ad0b71722195146a948a277dff25 (patch) | |
| tree | a40f2007e6928cc7375cb02010bc3c42ee5a3ec3 /xorg-server/dix/BuiltInAtoms | |
| parent | fa8048de701d8dfd0c66983733deb5fcb1a108c9 (diff) | |
| parent | 26686c98bac306ee4e6502850e2dc8afbe4a496a (diff) | |
| download | vcxsrv-35d058b84797ad0b71722195146a948a277dff25.tar.gz vcxsrv-35d058b84797ad0b71722195146a948a277dff25.tar.bz2 vcxsrv-35d058b84797ad0b71722195146a948a277dff25.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/glx/glapi.h
xorg-server/hw/xquartz/GL/indirect.c
xorg-server/hw/xquartz/X11Application.m
xorg-server/xkeyboard-config/symbols/jp
Diffstat (limited to 'xorg-server/dix/BuiltInAtoms')
0 files changed, 0 insertions, 0 deletions