aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/manpages.am
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-06-231-0/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0/+5
| |
* | merge ^/branches/released .marha2011-05-161-1/+1
|\|
| * xserver xkeyboar-config mesa git update 16 May 2011marha2011-05-161-1/+1
| |
* | svn merge ^/branches/released .marha2011-04-281-37/+37
|\|
| * xserver xkeyboard-config mesa git update 28 Apr 2011marha2011-04-281-1/+1
|/
* xserver pixman mesa git update 19 jan 2011marha2011-01-191-0/+37