aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-01-172-1/+1
|\
| * git update mesa pixman xserver 17 jan 2012marha2012-01-172-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-139-19/+19
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: libxcb/src/xcb_auth.c libxcb/src/xcb_conn.c libxcb/src/xcb_out.c libxcb/src/xcb_util.c xorg-server/dix/dispatch.c xorg-server/include/dixstruct.h xorg-server/include/misc.h xorg-server/os/connection.c
| * libxtrans libXdmcp libxcb mesa xserver git update 13 jan 2012marha2012-01-139-19/+19
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-1127-2494/+2448
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: pixman/pixman/pixman-trap.c xorg-server/Xext/xace.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winwin32rootlesswindow.c xorg-server/include/dixstruct.h xorg-server/os/connection.c
| * mesa pixman xserver git update 11 jan 2012marha2012-01-1128-2440/+2390
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-291-1/+1
|\|
| * xserver libX11 mesa xkeyboard-config git update 28 dec 2011marha2011-12-281-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-2311-41/+108
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/glx/dispatch.h xorg-server/glx/glapi.c xorg-server/glx/indirect_dispatch.h xorg-server/glx/indirect_reqsize.c xorg-server/glx/indirect_reqsize.h xorg-server/glx/indirect_size.h xorg-server/glx/indirect_size_get.c xorg-server/glx/indirect_size_get.h xorg-server/glx/indirect_table.c xorg-server/mi/mieq.c
| * git mesa pixman xserver xkeyboard-config update 24 dec 2011marha2011-12-2311-41/+108
| |
* | Increased version to 1.11.3.0marha2011-12-171-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-173-23/+84
|\|
| * libX11 libxtrans mesa xserver git update 17 dec 2011marha2011-12-173-23/+84
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-1631-3004/+2986
|\| | | | | | | | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/registry.c xorg-server/include/resource.h xorg-server/os/access.c xorg-server/os/auth.c
| * xserver git update 16 dec 2011marha2011-12-1631-3004/+2986
| |
* | Added -parentprocessid command line parametermarha2011-12-161-0/+12
| |
* | Solved compilation errormarha2011-12-161-18/+18
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-122-1756/+1760
|\|
| * libxtrans libX11 libxcb xserver mesa git update 12 dec 2011marha2011-12-122-1756/+1760
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-0811-683/+696
|\|
| * git update glproto libX11 libxcb mesa xserver 8 dec 2011marha2011-12-0811-683/+696
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-051-2/+0
|\| | | | | | | | | Conflicts: xorg-server/dix/dispatch.c
| * xserver xkeyboard-config mesa git update 5 dec 2011marha2011-12-051-2/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-2561-11461/+11482
|\| | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/glx/glxdriswrast.c xorg-server/glx/single2.c xorg-server/hw/xwin/winconfig.c xorg-server/os/osinit.c xorg-server/os/xdmcp.c xorg-server/xkb/xkbInit.c
| * mesa xserver pixman git update 25 nov 2011marha2011-11-2561-11472/+11493
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-2111-1902/+1917
|\|
| * xserver xkeyboard-config mesa git update 21 nov 2011marha2011-11-2111-1902/+1917
| |
* | Bumped version to 1.11.2marha2011-11-181-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-174-2/+7
|\| | | | | | | | | Conflicts: mesalib/src/mesa/swrast/s_readpix.c
| * xserver mesa git update 17 nov 2011marha2011-11-174-2/+7
| |
* | Solved possible crashes due to null pointer accessmarha2011-11-083-6/+10
| |
* | miPointerSetPosition interface has been changes (solved problem of mousemarha2011-11-081-1/+3
| | | | | | | | not working anymore)
* | Solved problem of QueryMonitors not workingmarha2011-11-081-1/+1
| |
* | Solved compile problemsmarha2011-11-071-10/+10
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-071-1/+4
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c
| * xserver pixman mesa git update 7 nov 2011marha2011-11-071-1/+4
| |
* | Solved compile problemsmarha2011-11-042-2/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-0430-3876/+3755
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/ddraw.h xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwin32rootlesswndproc.c xorg-server/include/scrnintstr.h xorg-server/xkb/ddxList.c xorg-server/xkb/ddxLoad.c
| * xserver pixman mesa git update 4 nov 2011marha2011-11-0431-3952/+3765
| |
* | Solved crash due to NULL pointermarha2011-10-281-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-2722-1652/+1792
|\|
| * libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011marha2011-10-2622-1652/+1792
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-1958-8232/+7533
|\| | | | | | | | | Conflicts: xorg-server/include/os.h
| * libX11 libXext libXft mesa libxcb mkfontscale pixman xservermarha2011-10-1958-8232/+7533
| | | | | | | | xkeyboard-config git update 19 oct 2011
* | Handle more motif window decorating handlingmarha2011-10-102-1/+22
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-0525-6242/+6197
|\| | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h mesalib/src/mesa/main/syncobj.h xorg-server/dix/events.c xorg-server/dix/getevents.c xorg-server/include/misc.h
| * mkfontscale pixman xserver xtrans libX11 libXdmcp libxcb libXmu mesa git ↵marha2011-10-0525-6242/+6197
| | | | | | | | update 5 oct 2011
* | Added swrast dll based on wglmarha2011-10-0519-2/+37089
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-2716-787/+822
|\| | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/version.c xorg-server/include/globals.h xorg-server/mi/misprite.c xorg-server/mi/mivaltree.c xorg-server/os/utils.c
| * libX11 pixman mesa xserver git update 27 sep 2011marha2011-09-2716-787/+822
| |