diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-06 10:36:17 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-06 10:36:17 +0200 |
| commit | 336e4aab196609a528213e9ecebcb30fce7aa654 (patch) | |
| tree | c8a72cf42c0bbe281dffdac04d60e758aeea345f /xorg-server/hw/xquartz/bundle/Resources | |
| parent | 097c0d8400d976c5c372db576a11764e87994c7f (diff) | |
| parent | 416761431e76dcb053fa3447b6d53051579dad0a (diff) | |
| download | vcxsrv-336e4aab196609a528213e9ecebcb30fce7aa654.tar.gz vcxsrv-336e4aab196609a528213e9ecebcb30fce7aa654.tar.bz2 vcxsrv-336e4aab196609a528213e9ecebcb30fce7aa654.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/hw/xquartz/GL/indirect.c
xorg-server/hw/xquartz/mach-startup/Makefile.am
xorg-server/test/xi2/protocol-common.c
xorg-server/xkb/xkbfmisc.c
Diffstat (limited to 'xorg-server/hw/xquartz/bundle/Resources')
0 files changed, 0 insertions, 0 deletions