aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin/man
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-07-142-1/+5
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/state_tracker/st_context.c xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xwin/glx/indirect.c xorg-server/hw/xwin/glx/wgl_ext_api.c xorg-server/hw/xwin/glx/winpriv.c xorg-server/hw/xwin/man/XWin.man xorg-server/hw/xwin/winmultiwindowwindow.c
| * mesa xserver git update 14 july 2011marha2011-07-142-1/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-231-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/mtypes.h mesalib/src/mesa/main/state.c mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_format.c mesalib/src/mesa/state_tracker/st_format.h pixman/pixman/pixman-arm-common.h pixman/pixman/pixman-arm-neon.c pixman/pixman/pixman-fast-path.c pixman/pixman/pixman-fast-path.h pixman/pixman/pixman.h xorg-server/configure.ac xorg-server/hw/xwin/man/XWin.man xorg-server/manpages.am
| * libX11 mesa pixman xserver git update 23 June 2011marha2011-06-231-1/+2
| |
* | svn merge ^/branches/released .marha2011-04-281-397/+398
|\|
| * xserver xkeyboard-config mesa git update 28 Apr 2011marha2011-04-281-1/+2
|/
* xserver mesa xkbcomp libxcb git update 21 jan 2011marha2011-01-211-17/+68
|
* xserver pixman mesa git update 19 jan 2011marha2011-01-193-0/+602