aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin/winmonitors.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-04-161-6/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/Xext/securitysrv.h xorg-server/glx/glxext.h xorg-server/glx/indirect_reqsize.c xorg-server/glx/indirect_size_get.c xorg-server/hw/xwin/winclip.c xorg-server/hw/xwin/winfont.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winglobals.h xorg-server/hw/xwin/winmonitors.h xorg-server/include/closestr.h xorg-server/include/pixmapstr.h xorg-server/include/servermd.h xorg-server/include/site.h xorg-server/include/windowstr.h xorg-server/include/xkbstr.h
| * libX11 xserver pixman mesa git update 16 Apr 2012marha2012-04-161-6/+6
| |
* | Added taskbar grouping for windows 7marha2012-02-231-0/+1
|/
* xserver mesa xkbcomp libxcb git update 21 jan 2011marha2011-01-211-0/+14