diff options
| author | marha <marha@users.sourceforge.net> | 2011-07-29 11:17:40 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-07-29 11:17:40 +0200 |
| commit | a69cff9373daf6b7afc97fb975ceb4fc0d6864f7 (patch) | |
| tree | 2c04fb8e0dc217b9f418c8ec37f17973a93779a2 /xorg-server | |
| parent | fa08275a130f5693e2add977df7cf38d44f2f8da (diff) | |
| parent | 28257038c4f13ac26127d536c14c922aa036efed (diff) | |
| download | vcxsrv-a69cff9373daf6b7afc97fb975ceb4fc0d6864f7.tar.gz vcxsrv-a69cff9373daf6b7afc97fb975ceb4fc0d6864f7.tar.bz2 vcxsrv-a69cff9373daf6b7afc97fb975ceb4fc0d6864f7.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libX11/configure.ac
mesalib/src/mesa/main/ff_fragment_shader.cpp
mesalib/src/mesa/main/framebuffer.c
mesalib/src/mesa/main/texparam.c
pixman/pixman/pixman-arm-neon-asm.S
Diffstat (limited to 'xorg-server')
0 files changed, 0 insertions, 0 deletions